Merge branch 'for-linus' of git://github.com/tiwai/sound

* 'for-linus' of git://github.com/tiwai/sound:
  ALSA: pcm - fix race condition in wait_for_avail()
  ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name
  ALSA: hda - Terminate the recursive connection search properly
  ASoC: Fix trivial build regression in Kirkwood I2S
  ASoC: Blackfin: bf5xx-ad193x: Fix codec device name
  ASoC: Fix reporting of partial jack updates
  ASoC: imx: Fix build warning of unused 'card' variable
  ASoC: Fix register cache sync register_writable WARN_ONs
  ASoC: snd_soc_codec_{readable,writable}_register change default to true
  ASoC: soc-dapm: Fix parameter comment for snd_soc_dapm_free
  MAINTAINERS: Add some missed Wolfson files
  ASoC: MPC5200: replace of_device with platform_device

diff --combined MAINTAINERS
index 7658e1f,0b4ccdd..0acf9ab
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1883,7 -1883,7 +1883,7 @@@ S:      Maintaine
  F:    drivers/connector/
  
  CONTROL GROUPS (CGROUPS)
 -M:    Paul Menage <menage@google.com>
 +M:    Paul Menage <paul@paulmenage.org>
  M:    Li Zefan <lizf@cn.fujitsu.com>
  L:    containers@lists.linux-foundation.org
  S:    Maintained
@@@ -1932,7 -1932,7 +1932,7 @@@ S:      Maintaine
  F:    tools/power/cpupower
  
  CPUSETS
 -M:    Paul Menage <menage@google.com>
 +M:    Paul Menage <paul@paulmenage.org>
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
  S:    Supported
@@@ -2649,11 -2649,11 +2649,11 @@@ F:   drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Paul Mundt <lethal@linux-sh.org>
 +M:    Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  L:    linux-fbdev@vger.kernel.org
  W:    http://linux-fbdev.sourceforge.net/
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
 +T:    git git://github.com/schandinat/linux-2.6.git fbdev-next
  S:    Maintained
  F:    Documentation/fb/
  F:    Documentation/devicetree/bindings/fb/
@@@ -3262,17 -3262,6 +3262,17 @@@ F:    Documentation/input/multi-touch-prot
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
 +INTEL C600 SERIES SAS CONTROLLER DRIVER
 +M:    Intel SCU Linux support <intel-linux-scu@intel.com>
 +M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dave Jiang <dave.jiang@intel.com>
 +M:    Ed Nadolski <edmund.nadolski@intel.com>
 +L:    linux-scsi@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
 +S:    Maintained
 +F:    drivers/scsi/isci/
 +F:    firmware/isci/
 +
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@lists.linux-foundation.org
@@@ -3916,9 -3905,9 +3916,9 @@@ F:      arch/powerpc/platforms/powermac
  F:    drivers/macintosh/
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
 -M:    Grant Likely <grant.likely@secretlab.ca>
 +M:    Anatolij Gustschin <agust@denx.de>
  L:    linuxppc-dev@lists.ozlabs.org
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
 +T:    git git://git.denx.de/linux-2.6-agust.git
  S:    Maintained
  F:    arch/powerpc/platforms/512x/
  F:    arch/powerpc/platforms/52xx/
@@@ -4461,8 -4450,8 +4461,8 @@@ M:      "David S. Miller" <davem@davemloft.n
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
  W:    http://patchwork.ozlabs.org/project/netdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
  S:    Maintained
  F:    net/
  F:    include/net/
@@@ -4785,7 -4774,7 +4785,7 @@@ F:      drivers/net/wireless/orinoco
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <bharrosh@panasas.com>
 -M:    Benny Halevy <bhalevy@panasas.com>
 +M:    Benny Halevy <bhalevy@tonian.com>
  L:    osd-dev@open-osd.org
  W:    http://open-osd.org
  T:    git git://git.open-osd.org/open-osd.git
@@@ -4982,7 -4971,7 +4982,7 @@@ M:      Paul Mackerras <paulus@samba.org
  M:    Ingo Molnar <mingo@elte.hu>
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  S:    Supported
 -F:    kernel/perf_event*.c
 +F:    kernel/events/*
  F:    include/linux/perf_event.h
  F:    arch/*/kernel/perf_event*.c
  F:    arch/*/kernel/*/perf_event*.c
@@@ -7099,7 -7088,7 +7099,7 @@@ S:      Supporte
  F:    drivers/mmc/host/vub300.c
  
  W1 DALLAS'S 1-WIRE BUS
 -M:    Evgeniy Polyakov <johnpol@2ka.mipt.ru>
 +M:    Evgeniy Polyakov <zbr@ioremap.net>
  S:    Maintained
  F:    Documentation/w1/
  F:    drivers/w1/
@@@ -7211,6 -7200,9 +7211,9 @@@ W:      http://opensource.wolfsonmicro.com/c
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    drivers/leds/leds-wm83*.c
+ F:    drivers/input/misc/wm831x-on.c
+ F:    drivers/input/touchscreen/wm831x-ts.c
+ F:    drivers/input/touchscreen/wm97*.c
  F:    drivers/mfd/wm8*.c
  F:    drivers/power/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
@@@ -7220,6 -7212,7 +7223,7 @@@ F:      drivers/watchdog/wm83*_wdt.
  F:    include/linux/mfd/wm831x/
  F:    include/linux/mfd/wm8350/
  F:    include/linux/mfd/wm8400*
+ F:    include/linux/wm97xx.h
  F:    include/sound/wm????.h
  F:    sound/soc/codecs/wm*
  
@@@ -7369,7 -7362,7 +7373,7 @@@ THE RES
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/LKML/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  S:    Buried alive in reporters
  F:    *
  F:    */