Arnd Bergmann a754a87ce8 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>
2012-03-27 15:18:19 -07:00
..
2011-08-17 00:53:54 +09:00
2011-06-16 11:24:17 +01:00
2011-06-28 17:11:20 +01:00
2011-05-19 14:10:45 -07:00
2011-03-11 12:01:44 +00:00
2011-09-21 15:52:23 +01:00
2011-11-29 12:01:23 +00:00
2011-11-29 12:01:23 +00:00
2011-03-31 11:26:23 -03:00
2012-02-21 09:58:47 +00:00
2012-01-26 16:07:55 +00:00
2012-03-04 14:34:44 +00:00
2012-01-20 13:58:22 +00:00
2011-07-15 23:39:53 +09:00
2012-03-14 20:37:29 +00:00
2012-02-14 18:13:06 -08:00