From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 24 Mar 2012 11:33:59 +0000 (+0000)
Subject: Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound... 
X-Git-Tag: v3.4-rc1~88^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a754a87ce8b17024358c1be8ee0232ef09a7055f;p=pandora-kernel.git

Merge tag 'asoc-3.4' of git://git./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>
---

a754a87ce8b17024358c1be8ee0232ef09a7055f
Reading git-diff-tree failed