author | Dan Murphy <dmurphy@ti.com> | |
Wed, 12 Jun 2013 19:21:38 +0000 (14:21 -0500) | ||
committer | Dan Murphy <dmurphy@ti.com> | |
Wed, 12 Jun 2013 19:21:38 +0000 (14:21 -0500) |
TI-Feature: omap5_audio_video_base
TI-Tree: git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree.git
TI-Branch: omap5_audio_video-3.8.y
* 'omap5_audio_video-3.8.y' of git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
ASoC: OMAP4+: AESS: aess_mem: Activate AESS for memory/register access
ARM: dts: OMAP5: AESS: Fix AESS L3 Interconnect address
ASoC: OMAP: ABE: Pick working ABE support from LDC audio branch
Conflicts:
arch/arm/configs/omap2plus_defconfig
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Tree: git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree.git
TI-Branch: omap5_audio_video-3.8.y
* 'omap5_audio_video-3.8.y' of git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
ASoC: OMAP4+: AESS: aess_mem: Activate AESS for memory/register access
ARM: dts: OMAP5: AESS: Fix AESS L3 Interconnect address
ASoC: OMAP: ABE: Pick working ABE support from LDC audio branch
Conflicts:
arch/arm/configs/omap2plus_defconfig
Signed-off-by: Dan Murphy <dmurphy@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/omap5.dtsi | patch | | diff1 | | diff2 | | blob | history |
arch/arm/configs/omap2plus_defconfig | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge
diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge