| 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) | ||
| commit | 4f116c97e84d0a35f29977a6f4d1e3dd9e438eae | |
| tree | 295d52c1b81cae7ac8e31fde60c242c3fea7bfc7 | tree | snapshot (tar.xz tar.gz zip) |
| parent | f3cb62a800ae37f17a3382b10d155ee02dbc83fc | commit | diff |
| parent | bbce7f58c437ff2730a15d9dcb35eeee0ee6be6c | commit | diff |
Merge branch 'omap5_audio_video-3.8.y' of git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree into ti-linux-3.8.y
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-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>
| arch/arm/boot/dts/omap5.dtsi | diff1 | | diff2 | | blob | history |
| arch/arm/configs/omap2plus_defconfig | diff1 | | diff2 | | blob | history |