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

diff --cc sound/soc/codecs/wm5100.c
index f6b6ea8980226f76f02ec4a53f1382f3ce6f9ee8,89f2af77b1c3983afaa407e6ff2740ec95e0c068..2339aa0e9453e5eadea52e541901b8292a333c26
--- 1/sound/soc/codecs/wm5100.c
--- 2/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@@ -2051,8 -2182,9 +2051,9 @@@ static void wm5100_micd_irq(struct wm51
         */
        if (val & 0x400) {
                if (wm5100->jack_detecting) {
 -                      dev_dbg(codec->dev, "Microphone detected\n");
 +                      dev_dbg(wm5100->dev, "Microphone detected\n");
                        wm5100->jack_mic = true;
+                       wm5100->jack_detecting = false;
                        snd_soc_jack_report(wm5100->jack,
                                            SND_JACK_HEADSET,
                                            SND_JACK_HEADSET | SND_JACK_BTN_0);

diff --cc sound/soc/codecs/wm8962.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
Simple merge

diff --cc sound/soc/codecs/wm8996.c
Simple merge

diff --cc sound/soc/codecs/wm_hubs.c
Simple merge

diff --cc sound/soc/samsung/neo1973_wm8753.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge