Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 12:00:22 +0000 (12:00 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 12:00:22 +0000 (12:00 +0000)
commita08a499aa3d85b605b5669cfc82b8e14232f7e91
treefd82da95552c996e9522a068ec77eae3a5ac6eec
parent6d70934a0248d0d92e01116807c02c00ae172299
parentd65b4e98d7ea3038b767b70fe8be959b2913f16d
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
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8996.c
sound/soc/codecs/wm_hubs.c
sound/soc/samsung/neo1973_wm8753.c
sound/soc/soc-core.c