Merge 3.9-rc7 into char-misc-next

We want the fixes in there.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --combined MAINTAINERS
index d8e6e8cadead1a64c09186349ed999bc9eacefe9,8bdd7a7ef2f4687aa26ee66a70fe8ad428e14890..c901dfa6a2eb172ef65daca731bc16ddc4092444
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1031,7 -1031,6 +1031,7 @@@ F:      drivers/mmc/host/msm_sdcc.
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
 +F:    drivers/ssbi/
  F:    include/linux/mfd/pm8xxx/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
  S:    Maintained
@@@ -4942,6 -4941,12 +4942,12 @@@ W:    logfs.or
  S:    Maintained
  F:    fs/logfs/
  
+ LPC32XX MACHINE SUPPORT
+ M:    Roland Stigge <stigge@antcom.de>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-lpc32xx/
+ 
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
  M:    Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
@@@ -5066,9 -5071,8 +5072,8 @@@ S:      Maintaine
  F:    drivers/net/ethernet/marvell/sk*
  
  MARVELL LIBERTAS WIRELESS DRIVER
- M:    Dan Williams <dcbw@redhat.com>
  L:    libertas-dev@lists.infradead.org
- S:    Maintained
+ S:    Orphan
  F:    drivers/net/wireless/libertas/
  
  MARVELL MV643XX ETHERNET DRIVER
@@@ -5570,6 -5574,7 +5575,7 @@@ F:      include/uapi/linux/if_
  F:    include/uapi/linux/netdevice.h
  
  NETXEN (1/10) GbE SUPPORT
+ M:    Manish Chopra <manish.chopra@qlogic.com>
  M:    Sony Chacko <sony.chacko@qlogic.com>
  M:    Rajesh Borundia <rajesh.borundia@qlogic.com>
  L:    netdev@vger.kernel.org
@@@ -6626,7 -6631,7 +6632,7 @@@ S:      Supporte
  F:    fs/reiserfs/
  
  REGISTER MAP ABSTRACTION
- M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
+ M:    Mark Brown <broonie@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
  S:    Supported
  F:    drivers/base/regmap/
@@@ -6952,7 -6957,6 +6958,6 @@@ F:      drivers/scsi/st
  
  SCTP PROTOCOL
  M:    Vlad Yasevich <vyasevich@gmail.com>
- M:    Sridhar Samudrala <sri@us.ibm.com>
  M:    Neil Horman <nhorman@tuxdriver.com>
  L:    linux-sctp@vger.kernel.org
  W:    http://lksctp.sourceforge.net
@@@ -7375,7 -7379,7 +7380,7 @@@ F:      sound
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <lgirdwood@gmail.com>
- M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
+ M:    Mark Brown <broonie@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
@@@ -7464,7 -7468,7 +7469,7 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
- M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
+ M:    Mark Brown <broonie@kernel.org>
  L:    spi-devel-general@lists.sourceforge.net
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -8709,7 -8713,7 +8714,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@ti.com>
- M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
+ M:    Mark Brown <broonie@kernel.org>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git

diff --combined sound/soc/codecs/wm5102.c
index 2657aad3f8b16165da560a82feb641a71572646b,34d0201d6a78a86a5dd6f1568dd898919fb8b512..15bc31f1abb1a0fd6a5030b5f159f859a13170ee
--- 1/sound/soc/codecs/wm5102.c
--- 2/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@@ -584,7 -584,7 +584,7 @@@ static int wm5102_sysclk_ev(struct snd_
                            struct snd_kcontrol *kcontrol, int event)
  {
        struct snd_soc_codec *codec = w->codec;
-       struct arizona *arizona = dev_get_drvdata(codec->dev);
+       struct arizona *arizona = dev_get_drvdata(codec->dev->parent);
        struct regmap *regmap = codec->control_data;
        const struct reg_default *patch = NULL;
        int i, patch_size;
@@@ -1131,11 -1131,11 +1131,11 @@@ ARIZONA_DSP_WIDGETS(DSP1, "DSP1")
  SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
                       ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5102_aec_loopback_mux),
  
 -SND_SOC_DAPM_PGA_E("OUT1L", ARIZONA_OUTPUT_ENABLES_1,
 -                 ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
 +SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
 +                 ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,
                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
 -SND_SOC_DAPM_PGA_E("OUT1R", ARIZONA_OUTPUT_ENABLES_1,
 -                 ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,
 +SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,
 +                 ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,
                   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
  SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,
                   ARIZONA_OUT2L_ENA_SHIFT, 0, NULL, 0, arizona_out_ev,