From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Feb 2012 12:00:22 +0000 (+0000)
Subject: Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
X-Git-Tag: v3.4-rc1~88^2^2~27^2~128
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a08a499aa3d85b605b5669cfc82b8e14232f7e91;p=pandora-kernel.git

Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.

Linux 3.3-rc3

.. the number of the half-beast?

Conflicts:
	sound/soc/codecs/wm5100.c
	sound/soc/codecs/wm8994.c
---

a08a499aa3d85b605b5669cfc82b8e14232f7e91
Reading git-diff-tree failed