a754a87ce8
The asoc branch that was already merged into v3.4 contains some board-level changes that conflict with patches we already have here, so pull in that branch to resolve the conflicts. Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c arch/arm/mach-omap2/board-omap4panda.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended fix for mismerge as reported by Kevin Hilman] Signed-off-by: Olof Johansson <olof@lixom.net> |
||
---|---|---|
.. | ||
include/mach | ||
adssphere.c | ||
clock.c | ||
core.c | ||
dma.c | ||
edb93xx.c | ||
gesbc9312.c | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
micro9.c | ||
simone.c | ||
snappercl15.c | ||
ts72xx.c | ||
vision_ep9307.c |