tree c0d4adee8f490828ca04cd45d6fbb13596d88322
parent 70688056a8b4d610249716befe262a74fd123d90
parent 22f8d055350066b4a87de4adea8c5213cac54534
author Arnd Bergmann <arnd@arndb.de> 1332588839 +0000
committer Olof Johansson <olof@lixom.net> 1332886699 -0700

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards

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>