| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Wed, 12 Jun 2013 22:58:09 +0000 (17:58 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Wed, 12 Jun 2013 22:58:09 +0000 (17:58 -0500) | ||
| commit | 571f272e50a771ed0031447ddfee35229c1be244 | |
| tree | d202df466d117c30fcd8f038b628ca7622868b55 | tree | snapshot (tar.xz tar.gz zip) |
| parent | fc0b661dc67ac653d3b22304d9633aa17b597431 | commit | diff |
| parent | 4f116c97e84d0a35f29977a6f4d1e3dd9e438eae | commit | diff |
Merge branch 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.8.y
* 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
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
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
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
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>