Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Fix unused warnings when !SND_HDA_NEEDS_RESUME
  ALSA: hda - Add a fix-up for Acer dmic with ALC271x codec
  ASoC: add a module alias to the FSI driver
  ALSA: emu10k1 - Fix "Music" controls to "Synth" controls in documents
  ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface
  ASoC: codecs: JZ4740: Fix OOPS
  ASoC: Fix output PGA enabling in wm_hubs CODECs
  ASoC: sn95031: decorate function with __devexit_p()
  ASoC: SAMSUNG: Fix the inverted clocks handling for pcm driver
  ASoC: sst_platform: Fix lock acquring
  ASoC: fsi: driver safely remove for against irq
  ASoC: fsi: modify vague PM control on probe
  ASoC: fsi: take care in failing case of dai register
  MAINTAINERS: Update Samsung ASoC maintainer's id
  ASoC: WM8903: HP and Line out PGA/mixer DAPM fixes
  ASoC: Set left channel volume update bits for WM8994
  ASoC: fix config error path
  ASoC: check channel mismatch between cpu_dai and codec_dai
  ASoC: Tegra: Suspend/resume support

diff --combined MAINTAINERS
index 1e2724e55cf014319b16bcbde917dabefbed23f7,9f926c0229db3bd76ed0b5982b31398ade6a0868..13803127b68fbfdb48036a064fddf78ef14fd26b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -151,7 -151,6 +151,7 @@@ S: Maintaine
  F:    drivers/net/hamradio/6pack.c
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
 +M:    Realtek linux nic maintainers <nic_swsd@realtek.com>
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -185,9 -184,10 +185,9 @@@ F:        Documentation/filesystems/9p.tx
  F:    fs/9p/
  
  A2232 SERIAL BOARD DRIVER
 -M:    Enver Haase <A2232@gmx.net>
  L:    linux-m68k@lists.linux-m68k.org
 -S:    Maintained
 -F:    drivers/char/ser_a2232*
 +S:    Orphan
 +F:    drivers/staging/generic_serial/ser_a2232*
  
  AACRAID SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <aacraid@adaptec.com>
@@@ -877,13 -877,6 +877,13 @@@ F:       arch/arm/mach-mv78xx0
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
  
 +ARM/Orion SoC/Technologic Systems TS-78xx platform support
 +M:    Alexander Clouter <alex@digriz.org.uk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +W:    http://www.digriz.org.uk/ts78xx/kernel
 +S:    Maintained
 +F:    arch/arm/mach-orion5x/ts78xx-*
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1070,7 -1063,7 +1070,7 @@@ F:      arch/arm/mach-shmobile
  F:    drivers/sh/
  
  ARM/TELECHIPS ARM ARCHITECTURE
 -M:    "Hans J. Koch" <hjk@linutronix.de>
 +M:    "Hans J. Koch" <hjk@hansjkoch.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/plat-tcc/
@@@ -1830,10 -1823,11 +1830,10 @@@ S:   Maintaine
  F:    drivers/platform/x86/compal-laptop.c
  
  COMPUTONE INTELLIPORT MULTIPORT CARD
 -M:    "Michael H. Warfield" <mhw@wittsend.com>
  W:    http://www.wittsend.com/computone.html
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/serial/computone.txt
 -F:    drivers/char/ip2/
 +F:    drivers/staging/tty/ip2/
  
  CONEXANT ACCESSRUNNER USB DRIVER
  M:    Simon Arlott <cxacru@fire.lp0.eu>
@@@ -2016,7 -2010,7 +2016,7 @@@ F:      drivers/net/wan/cycx
  CYCLADES ASYNC MUX DRIVER
  W:    http://www.cyclades.com/
  S:    Orphan
 -F:    drivers/char/cyclades.c
 +F:    drivers/tty/cyclades.c
  F:    include/linux/cyclades.h
  
  CYCLADES PC300 DRIVER
@@@ -2130,8 -2124,8 +2130,8 @@@ L:      Eng.Linux@digi.co
  W:    http://www.digi.com
  S:    Orphan
  F:    Documentation/serial/digiepca.txt
 -F:    drivers/char/epca*
 -F:    drivers/char/digi*
 +F:    drivers/staging/tty/epca*
 +F:    drivers/staging/tty/digi*
  
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <guenter.roeck@ericsson.com>
@@@ -4083,7 -4077,7 +4083,7 @@@ F:      drivers/video/matrox/matroxfb_
  F:    include/linux/matroxfb.h
  
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 -M:    "Hans J. Koch" <hjk@linutronix.de>
 +M:    "Hans J. Koch" <hjk@hansjkoch.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/max6650
@@@ -4198,7 -4192,7 +4198,7 @@@ MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL C
  M:    Jiri Slaby <jirislaby@gmail.com>
  S:    Maintained
  F:    Documentation/serial/moxa-smartio
 -F:    drivers/char/mxser.*
 +F:    drivers/tty/mxser.*
  
  MSI LAPTOP SUPPORT
  M:    "Lee, Chun-Yi" <jlee@novell.com>
@@@ -4240,7 -4234,7 +4240,7 @@@ F:      sound/oss/msnd
  
  MULTITECH MULTIPORT CARD (ISICOM)
  S:    Orphan
 -F:    drivers/char/isicom.c
 +F:    drivers/tty/isicom.c
  F:    include/linux/isicom.h
  
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
@@@ -5279,14 -5273,14 +5279,14 @@@ F:   drivers/memstick/host/r592.
  RISCOM8 DRIVER
  S:    Orphan
  F:    Documentation/serial/riscom8.txt
 -F:    drivers/char/riscom8*
 +F:    drivers/staging/tty/riscom8*
  
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
  S:    Maintained
  F:    Documentation/serial/rocket.txt
 -F:    drivers/char/rocket*
 +F:    drivers/tty/rocket*
  
  ROSE NETWORK LAYER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -5396,7 -5390,7 +5396,7 @@@ F:      drivers/media/video/*7146
  F:    include/media/*7146*
  
  SAMSUNG AUDIO (ASoC) DRIVERS
- M:    Jassi Brar <jassi.brar@samsung.com>
+ M:    Jassi Brar <jassisinghbrar@gmail.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung
@@@ -5922,9 -5916,10 +5922,9 @@@ F:     arch/arm/mach-spear6xx/spear600.
  F:    arch/arm/mach-spear6xx/spear600_evb.c
  
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 -M:    Roger Wolff <R.E.Wolff@BitWizard.nl>
 -S:    Supported
 +S:    Orphan
  F:    Documentation/serial/specialix.txt
 -F:    drivers/char/specialix*
 +F:    drivers/staging/tty/specialix*
  
  SPI SUBSYSTEM
  M:    David Brownell <dbrownell@users.sourceforge.net>
@@@ -5969,6 -5964,7 +5969,6 @@@ F:      arch/alpha/kernel/srm_env.
  
  STABLE BRANCH
  M:    Greg Kroah-Hartman <greg@kroah.com>
 -M:    Chris Wright <chrisw@sous-sol.org>
  L:    stable@kernel.org
  S:    Maintained
  
@@@ -6252,8 -6248,7 +6252,8 @@@ M:      Greg Ungerer <gerg@uclinux.org
  W:    http://www.uclinux.org/
  L:    uclinux-dev@uclinux.org  (subscribers-only)
  S:    Maintained
 -F:    arch/m68knommu/
 +F:    arch/m68k/*/*_no.*
 +F:    arch/m68k/include/asm/*_no.*
  
  UCLINUX FOR RENESAS H8/300 (H8300)
  M:    Yoshinori Sato <ysato@users.sourceforge.jp>
@@@ -6623,7 -6618,7 +6623,7 @@@ F:      fs/hostfs
  F:    fs/hppfs/
  
  USERSPACE I/O (UIO)
 -M:    "Hans J. Koch" <hjk@linutronix.de>
 +M:    "Hans J. Koch" <hjk@hansjkoch.de>
  M:    Greg Kroah-Hartman <gregkh@suse.de>
  S:    Maintained
  F:    Documentation/DocBook/uio-howto.tmpl