Merge branch 'fix/asoc' into for-linus

diff --combined MAINTAINERS
index f46d8e66333f69afacb60b99484a66b96c30da00,31306ceb5677ccfd859a489ca6a73833de66b341..d41d59e6b2619adf95c454459785a6033c0eed79
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -454,20 -454,9 +454,20 @@@ L:       linux-rdma@vger.kernel.or
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
 +ANALOG DEVICES INC ASOC DRIVERS
 +L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +W:    http://blackfin.uclinux.org/
 +S:    Supported
 +F:    sound/soc/blackfin/*
 +F:    sound/soc/codecs/ad1*
 +F:    sound/soc/codecs/adau*
 +F:    sound/soc/codecs/adav*
 +F:    sound/soc/codecs/ssm*
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <johannes@sipsolutions.net>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    sound/aoa/
@@@ -962,13 -951,6 +962,13 @@@ W:       http://www.fluff.org/ben/linux
  S:    Maintained
  F:    arch/arm/mach-s3c6410/
  
 +ARM/S5P ARM ARCHITECTURES
 +M:    Kukjin Kim <kgene.kim@samsung.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-s5p*/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Paul Mundt <lethal@linux-sh.org>
  M:    Magnus Damm <magnus.damm@gmail.com>
@@@ -1142,7 -1124,7 +1142,7 @@@ ATLX ETHERNET DRIVER
  M:    Jay Cliburn <jcliburn@gmail.com>
  M:    Chris Snook <chris.snook@gmail.com>
  M:    Jie Yang <jie.yang@atheros.com>
 -L:    atl1-devel@lists.sourceforge.net
 +L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/atl1
  W:    http://atl1.sourceforge.net
  S:    Maintained
@@@ -1227,7 -1209,7 +1227,7 @@@ F:      drivers/auxdisplay
  F:    include/linux/cfag12864b.h
  
  AVR32 ARCHITECTURE
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
  W:    http://www.atmel.com/products/AVR32/
  W:    http://avr32linux.org/
  W:    http://avrfreaks.net/
@@@ -1235,7 -1217,7 +1235,7 @@@ S:      Supporte
  F:    arch/avr32/
  
  AVR32/AT32AP MACHINE SUPPORT
 -M:    Haavard Skinnemoen <hskinnemoen@atmel.com>
 +M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
  S:    Supported
  F:    arch/avr32/mach-at32ap/
  
@@@ -1452,16 -1434,6 +1452,16 @@@ S:    Maintaine
  F:    Documentation/video4linux/cafe_ccic
  F:    drivers/media/video/cafe_ccic*
  
 +CAIF NETWORK LAYER
 +M:    Sjur Braendeland <sjur.brandeland@stericsson.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/networking/caif/
 +F:    drivers/net/caif/
 +F:    include/linux/caif/
 +F:    include/net/caif/
 +F:    net/caif/
 +
  CALGARY x86-64 IOMMU
  M:    Muli Ben-Yehuda <muli@il.ibm.com>
  M:    "Jon D. Mason" <jdmason@kudzu.us>
@@@ -1500,8 -1472,8 +1500,8 @@@ F:      include/linux/can/platform
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
 -L:    linuxppc-dev@ozlabs.org
 -L:    cbe-oss-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    cbe-oss-dev@lists.ozlabs.org
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  F:    arch/powerpc/include/asm/cell*.h
@@@ -1693,7 -1665,8 +1693,7 @@@ F:      kernel/cgroup
  F:    mm/*cgroup*
  
  CORETEMP HARDWARE MONITORING DRIVER
 -M:    Rudolf Marek <r.marek@assembler.cz>
 -M:    Huaxu Wan <huaxu.wan@intel.com>
 +M:    Fenghua Yu <fenghua.yu@intel.com>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/coretemp
@@@ -2206,12 -2179,6 +2206,12 @@@ W:    http://acpi4asus.sf.ne
  S:    Maintained
  F:    drivers/platform/x86/eeepc-laptop.c
  
 +EFIFB FRAMEBUFFER DRIVER
 +L:    linux-fbdev@vger.kernel.org
 +M:    Peter Jones <pjones@redhat.com>
 +S:    Maintained
 +F:    drivers/video/efifb.c
 +
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
@@@ -2224,12 -2191,6 +2224,12 @@@ L:    linux-rdma@vger.kernel.or
  S:    Supported
  F:    drivers/infiniband/hw/ehca/
  
 +EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 +M:    Breno Leitao <leitao@linux.vnet.ibm.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ehea/
 +
  EMBEDDED LINUX
  M:    Paul Gortmaker <paul.gortmaker@windriver.com>
  M:    Matt Mackall <mpm@selenic.com>
@@@ -2325,12 -2286,6 +2325,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 +FANOTIFY
 +M:    Eric Paris <eparis@redhat.com>
 +S:    Maintained
 +F:    fs/notify/fanotify/
 +F:    include/linux/fanotify.h
 +
  FARSYNC SYNCHRONOUS DRIVER
  M:    Kevin Curtis <kevin.curtis@farsite.co.uk>
  W:    http://www.farsite.co.uk/
@@@ -2416,13 -2371,13 +2416,13 @@@ F:   include/linux/fb.
  FREESCALE DMA DRIVER
  M:    Li Yang <leoli@freescale.com>
  M:    Zhang Wei <zw@zh-kernel.org>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
  FREESCALE I2C CPM DRIVER
  M:    Jochen Friedrich <jochen@scram.de>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cpm.c
@@@ -2438,7 -2393,7 +2438,7 @@@ F:      drivers/video/imxfb.
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
  M:    Vitaly Bordug <vbordug@ru.mvista.com>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/fs_enet/
@@@ -2446,7 -2401,7 +2446,7 @@@ F:      include/linux/fs_enet_pd.
  
  FREESCALE QUICC ENGINE LIBRARY
  M:    Timur Tabi <timur@freescale.com>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    arch/powerpc/sysdev/qe_lib/
  F:    arch/powerpc/include/asm/*qe.h
@@@ -2454,27 -2409,27 +2454,27 @@@
  FREESCALE USB PERIPHERAL DRIVERS
  M:    Li Yang <leoli@freescale.com>
  L:    linux-usb@vger.kernel.org
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/usb/gadget/fsl*
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <leoli@freescale.com>
  L:    netdev@vger.kernel.org
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/net/ucc_geth*
  
  FREESCALE QUICC ENGINE UCC UART DRIVER
  M:    Timur Tabi <timur@freescale.com>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    drivers/serial/ucc_uart.c
  
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <timur@freescale.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
  F:    sound/soc/fsl/fsl*
  F:    sound/soc/fsl/mpc8610_hpcd.c
@@@ -2609,7 -2564,7 +2609,7 @@@ F:      mm/memory-failure.
  F:    mm/hwpoison-inject.c
  
  HYPERVISOR VIRTUAL CONSOLE DRIVER
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Odd Fixes
  F:    drivers/char/hvc_*
  
@@@ -2670,14 -2625,9 +2670,14 @@@ S:    Maintaine
  F:    drivers/media/video/gspca/
  
  HARDWARE MONITORING
 +M:    Jean Delvare <khali@linux-fr.org>
 +M:    Guenter Roeck <guenter.roeck@ericsson.com>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
 -S:    Orphan
 +T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
 +T:    quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 +S:    Maintained
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
  F:    include/linux/hwmon*.h
@@@ -2815,6 -2765,11 +2815,6 @@@ S:     Maintaine
  F:    arch/x86/kernel/hpet.c
  F:    arch/x86/include/asm/hpet.h
  
 -HPET: ACPI
 -M:    Bob Picco <bob.picco@hp.com>
 -S:    Maintained
 -F:    drivers/char/hpet.c
 -
  HPFS FILESYSTEM
  M:    Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
  W:    http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
@@@ -3427,7 -3382,7 +3427,7 @@@ F:      drivers/s390/kvm
  
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
 -W:    http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 +W:    http://kernel.org/pub/linux/utils/kernel/kexec/
  L:    kexec@lists.infradead.org
  S:    Maintained
  F:    include/linux/kexec.h
@@@ -3521,9 -3476,9 +3521,9 @@@ F:      drivers/usb/misc/legousbtower.
  
  LGUEST
  M:    Rusty Russell <rusty@rustcorp.com.au>
 -L:    lguest@ozlabs.org
 +L:    lguest@lists.ozlabs.org
  W:    http://lguest.ozlabs.org/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/lguest/
  F:    arch/x86/lguest/
  F:    drivers/lguest/
@@@ -3540,7 -3495,7 +3540,7 @@@ LINUX FOR POWERPC (32-BIT AND 64-BIT
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
  M:    Paul Mackerras <paulus@samba.org>
  W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
@@@ -3550,14 -3505,14 +3550,14 @@@ F:   arch/powerpc
  LINUX FOR POWER MACINTOSH
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
  W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/platforms/powermac/
  F:    drivers/macintosh/
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Grant Likely <grant.likely@secretlab.ca>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    arch/powerpc/platforms/512x/
@@@ -3567,7 -3522,7 +3567,7 @@@ LINUX FOR POWERPC EMBEDDED PPC4X
  M:    Josh Boyer <jwboyer@linux.vnet.ibm.com>
  M:    Matt Porter <mporter@kernel.crashing.org>
  W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
  F:    arch/powerpc/platforms/40x/
@@@ -3576,7 -3531,7 +3576,7 @@@ F:      arch/powerpc/platforms/44x
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
  M:    Grant Likely <grant.likely@secretlab.ca>
  W:    http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    arch/powerpc/*/*virtex*
@@@ -3586,20 -3541,20 +3586,20 @@@ LINUX FOR POWERPC EMBEDDED PPC8X
  M:    Vitaly Bordug <vitb@kernel.crashing.org>
  M:    Marcelo Tosatti <marcelo@kvack.org>
  W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  M:    Kumar Gala <galak@kernel.crashing.org>
  W:    http://www.penguinppc.org/
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/platforms/83xx/
  
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  M:    Olof Johansson <olof@lixom.net>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/platforms/pasemi/
  F:    drivers/*/*pasemi*
@@@ -3788,8 -3743,9 +3788,8 @@@ W:      http://www.syskonnect.co
  S:    Supported
  
  MATROX FRAMEBUFFER DRIVER
 -M:    Petr Vandrovec <vandrove@vc.cvut.cz>
  L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
  
@@@ -3913,8 -3869,10 +3913,8 @@@ F:     Documentation/serial/moxa-smarti
  F:    drivers/char/mxser.*
  
  MSI LAPTOP SUPPORT
 -M:    Lennart Poettering <mzxreary@0pointer.de>
 +M:    Lee, Chun-Yi <jlee@novell.com>
  L:    platform-driver-x86@vger.kernel.org
 -W:    https://tango.0pointer.de/mailman/listinfo/s270-linux
 -W:    http://0pointer.de/lennart/tchibo.html
  S:    Maintained
  F:    drivers/platform/x86/msi-laptop.c
  
@@@ -3931,10 -3889,8 +3931,10 @@@ S:    Supporte
  F:    drivers/mfd/
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 -S:    Orphan
 +M:    Chris Ball <cjb@laptop.org>
  L:    linux-mmc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
 +S:    Maintained
  F:    drivers/mmc/
  F:    include/linux/mmc/
  
@@@ -3951,12 -3907,13 +3951,12 @@@ F:   Documentation/sound/oss/MultiSoun
  F:    sound/oss/msnd*
  
  MULTITECH MULTIPORT CARD (ISICOM)
 -M:    Jiri Slaby <jirislaby@gmail.com>
 -S:    Maintained
 +S:    Orphan
  F:    drivers/char/isicom.c
  F:    include/linux/isicom.h
  
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 -M:    Felipe Balbi <felipe.balbi@nokia.com>
 +M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://gitorious.org/usb/usb.git
  S:    Maintained
@@@ -3976,8 -3933,8 +3976,8 @@@ S:      Maintaine
  F:    drivers/net/natsemi.c
  
  NCP FILESYSTEM
 -M:    Petr Vandrovec <vandrove@vc.cvut.cz>
 -S:    Maintained
 +M:    Petr Vandrovec <petr@vandrovec.name>
 +S:    Odd Fixes
  F:    fs/ncpfs/
  
  NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
@@@ -4254,7 -4211,7 +4254,7 @@@ S:      Maintaine
  F:    drivers/char/hw_random/omap-rng.c
  
  OMAP USB SUPPORT
 -M:    Felipe Balbi <felipe.balbi@nokia.com>
 +M:    Felipe Balbi <balbi@ti.com>
  M:    David Brownell <dbrownell@users.sourceforge.net>
  L:    linux-usb@vger.kernel.org
  L:    linux-omap@vger.kernel.org
@@@ -4631,7 -4588,7 +4631,7 @@@ F:      include/linux/preempt.
  PRISM54 WIRELESS DRIVER
  M:    "Luis R. Rodriguez" <mcgrof@gmail.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://prism54.org
 +W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Obsolete
  F:    drivers/net/wireless/prism54/
  
@@@ -4644,14 -4601,14 +4644,14 @@@ F:   drivers/ata/sata_promise.
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    netdev@vger.kernel.org
 -L:    cbe-oss-dev@ozlabs.org
 +L:    cbe-oss-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/net/ps3_gelic_net.*
  
  PS3 PLATFORM SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
 -L:    linuxppc-dev@ozlabs.org
 -L:    cbe-oss-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    cbe-oss-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/boot/ps3*
  F:    arch/powerpc/include/asm/lv1call.h
@@@ -4665,7 -4622,7 +4665,7 @@@ F:      sound/ppc/snd_ps3
  
  PS3VRAM DRIVER
  M:    Jim Paris <jim@jtan.com>
 -L:    cbe-oss-dev@ozlabs.org
 +L:    cbe-oss-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
@@@ -4832,7 -4789,6 +4832,7 @@@ RCUTORTURE MODUL
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  S:    Supported
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -4857,7 -4813,6 +4857,7 @@@ M:      Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    include/linux/srcu*
@@@ -4865,10 -4820,12 +4865,10 @@@ F:   kernel/rcu
  F:    kernel/srcu*
  X:    kernel/rcutorture.c
  
 -REAL TIME CLOCK DRIVER
 +REAL TIME CLOCK DRIVER (LEGACY)
  M:    Paul Gortmaker <p_gortmaker@yahoo.com>
  S:    Maintained
 -F:    Documentation/rtc.txt
 -F:    drivers/rtc/
 -F:    include/linux/rtc.h
 +F:    drivers/char/rtc.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
@@@ -5008,6 -4965,12 +5008,12 @@@ F:    drivers/media/common/saa7146
  F:    drivers/media/video/*7146*
  F:    include/media/*7146*
  
+ SAMSUNG AUDIO (ASoC) DRIVERS
+ M:    Jassi Brar <jassi.brar@samsung.com>
+ L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ S:    Supported
+ F:    sound/soc/s3c24xx
+ 
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
  M:    Kang Yong <kangyong@telegent.com>
@@@ -5105,15 -5068,13 +5111,15 @@@ S:   Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -S:    Orphan
 +M:    Chris Ball <cjb@laptop.org>
  L:    linux-mmc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
 +S:    Maintained
  F:    drivers/mmc/host/sdhci.*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
  M:    Anton Vorontsov <avorontsov@ru.mvista.com>
 -L:    linuxppc-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/sdhci-of.*
@@@ -5530,8 -5491,8 +5536,8 @@@ F:      drivers/net/spider_net
  
  SPU FILE SYSTEM
  M:    Jeremy Kerr <jk@ozlabs.org>
 -L:    linuxppc-dev@ozlabs.org
 -L:    cbe-oss-dev@ozlabs.org
 +L:    linuxppc-dev@lists.ozlabs.org
 +L:    cbe-oss-dev@lists.ozlabs.org
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  F:    Documentation/filesystems/spufs.txt
@@@ -6450,8 -6411,10 +6456,10 @@@ F:    include/linux/wm97xx.
  WOLFSON MICROELECTRONICS DRIVERS
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  M:    Ian Lartey <ian@opensource.wolfsonmicro.com>
+ M:    Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
+ T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
- W:    http://opensource.wolfsonmicro.com/node/8
+ W:    http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
  S:    Supported
  F:    Documentation/hwmon/wm83??
  F:    drivers/leds/leds-wm83*.c