From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 17 Jan 2010 16:47:32 +0000 (+0000)
Subject: Merge branch 'mxc-audio' into for-2.6.34
X-Git-Tag: v2.6.34-rc1~243^2^2~73
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9135f6db09aa9d186f05d41e9c516ec8e3550d78;p=pandora-kernel.git

Merge branch 'mxc-audio' into for-2.6.34

Conflicts:
	arch/arm/plat-mxc/Makefile (dual add)
	sound/soc/imx/mx27vis_wm8974.c (API updates & removal)
---

9135f6db09aa9d186f05d41e9c516ec8e3550d78
Reading git-diff-tree failed