From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 11 Dec 2011 03:24:44 +0000 (+0800)
Subject: Merge branch 'for-3.2' into for-3.3
X-Git-Tag: v3.3-rc1~14^2~156
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a95197581ac58081772eab3bd5f114da87f98b;p=pandora-kernel.git

Merge branch 'for-3.2' into for-3.3

Conflicts:
	sound/soc/mxs/mxs-pcm.c
---

43a95197581ac58081772eab3bd5f114da87f98b
Reading git-diff-tree failed