| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Wed, 12 Jun 2013 23:00:19 +0000 (18:00 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Wed, 12 Jun 2013 23:00:19 +0000 (18:00 -0500) | ||
| commit | 49c30827f44027b24b22f9ced7e1375cb49a39a2 | |
| tree | 2c51bcae93a3a370e5dca20f891927682f08e1c2 | tree | snapshot (tar.xz tar.gz zip) |
| parent | bb0f91ad4f5b0d64c370a75cd8ca95f931deddb8 | commit | diff |
| parent | 571f272e50a771ed0031447ddfee35229c1be244 | commit | diff |
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
* p-ti-linux-3.8.y:
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>
* p-ti-linux-3.8.y:
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>