Merge tag 'v3.3-rc2' into for-3.4
Mark Brown [Wed, 1 Feb 2012 10:08:15 +0000 (10:08 +0000)]
A reasonable amount of new development is causing fiddly merge conflicts
between different resource management changes (mostly fixing bugs in
resource management due to noticing things while doing enhancements in
the same area).

Linux 3.3-rc2

.. several days delayed. No reason, I just didn't think of it.

1  2 
Documentation/driver-model/devres.txt
drivers/base/regmap/regmap.c
drivers/regulator/core.c
sound/soc/codecs/wm8996.c

Simple merge
Simple merge
Simple merge
Simple merge