Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'

* acpi-dock:
  MAINTAINERS: remove maintainship entry of docking station driver

* acpi-ec:
  ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()

* acpi-scan:
  ACPI / scan: Add a scan handler for PRP0001
  ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()

diff --combined MAINTAINERS
index f7bbaece56498fcc75b722c042c9a1678a629b81,e1ec7785005c67e216761ba833c7248ca51fbf8f,f7bbaece56498fcc75b722c042c9a1678a629b81,0e1abe8cc6840369966a5dc3a754f23a8eca94ab..779d1df5fba90d1aa8775038cc98d9990cb08478
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
+++ b/MAINTAINERS
@@@@@ -625,19 -625,19 -625,19 -625,20 +625,19 @@@@@ F:  drivers/iommu/amd_iommu*.[ch
    F:  include/linux/amd-iommu.h
    
    AMD KFD
 - -M:      Oded Gabbay <[email protected]>
 - -L:      [email protected]
 - -T:      git git://people.freedesktop.org/~gabbayo/linux.git
 - -S:      Supported
 - -F:      drivers/gpu/drm/amd/amdkfd/
 + +M:  Oded Gabbay <[email protected]>
 + +L:  [email protected]
 + +T:  git git://people.freedesktop.org/~gabbayo/linux.git
 + +S:  Supported
 + +F:  drivers/gpu/drm/amd/amdkfd/
    F:  drivers/gpu/drm/amd/include/cik_structs.h
    F:  drivers/gpu/drm/amd/include/kgd_kfd_interface.h
 - -F:      drivers/gpu/drm/radeon/radeon_kfd.c
 - -F:      drivers/gpu/drm/radeon/radeon_kfd.h
 - -F:      include/uapi/linux/kfd_ioctl.h
 + +F:  drivers/gpu/drm/radeon/radeon_kfd.c
 + +F:  drivers/gpu/drm/radeon/radeon_kfd.h
 + +F:  include/uapi/linux/kfd_ioctl.h
    
    AMD MICROCODE UPDATE SUPPORT
   -M:  Andreas Herrmann <[email protected]>
   -L:  [email protected]
   +M:  Borislav Petkov <[email protected]>
    S:  Maintained
    F:  arch/x86/kernel/cpu/microcode/amd*
    
@@@@@ -724,7 -724,7 -724,7 -725,7 +724,7 @@@@@ F:       staging/iio/trigger/iio-trig-bfin-ti
    
    ANDROID DRIVERS
    M:  Greg Kroah-Hartman <[email protected]>
   -M:  Arve Hjønnevåg <[email protected]>
   +M:  Arve Hjønnevåg <[email protected]>
    M:  Riley Andrews <[email protected]>
    T:  git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
    L:  [email protected]
@@@@@ -1185,7 -1185,7 -1185,7 -1186,7 +1185,7 @@@@@ M:  Sebastian Hesselbarth <sebastian.hes
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
    F:  arch/arm/mach-mvebu/
   -F:  drivers/rtc/armada38x-rtc
   +F:  drivers/rtc/rtc-armada38x.c
    
    ARM/Marvell Berlin SoC support
    M:  Sebastian Hesselbarth <[email protected]>
@@@@@ -1215,7 -1215,6 -1215,7 -1216,6 +1215,7 @@@@@ F:  arch/arm/mach-orion5x/ts78xx-
    ARM/Mediatek SoC support
    M:  Matthias Brugger <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
 + +L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
    F:  arch/arm/boot/dts/mt6*
    F:  arch/arm/boot/dts/mt8*
@@@@@ -1362,7 -1361,7 -1362,7 -1362,6 +1362,7 @@@@@ F:  drivers/i2c/busses/i2c-rk3x.
    F:  drivers/*/*rockchip*
    F:  drivers/*/*/*rockchip*
    F:  sound/soc/rockchip/
   +N:  rockchip
    
    ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
    M:  Kukjin Kim <[email protected]>
@@@@@ -1469,8 -1468,8 -1469,8 -1468,6 +1469,8 @@@@@ F:  drivers/clocksource/arm_global_timer
    F:  drivers/i2c/busses/i2c-st.c
    F:  drivers/media/rc/st_rc.c
    F:  drivers/mmc/host/sdhci-st.c
   +F:  drivers/phy/phy-miphy28lp.c
   +F:  drivers/phy/phy-miphy365x.c
    F:  drivers/phy/phy-stih407-usb.c
    F:  drivers/phy/phy-stih41x-usb.c
    F:  drivers/pinctrl/pinctrl-st.c
@@@@@ -1678,8 -1677,8 -1678,8 -1675,8 +1678,8 @@@@@ F:  drivers/misc/eeprom/at24.
    F:  include/linux/platform_data/at24.h
    
    ATA OVER ETHERNET (AOE) DRIVER
   -M:  "Ed L. Cashin" <e[email protected]>
   -W:  http://support.coraid.com/support/linux
   +M:  "Ed L. Cashin" <e[email protected]>
   +W:  http://www.openaoe.org/
    S:  Supported
    F:  Documentation/aoe/
    F:  drivers/block/aoe/
@@@@@ -1744,7 -1743,7 -1744,7 -1741,7 +1744,7 @@@@@ S:  Maintaine
    F:  drivers/net/ethernet/atheros/
    
    ATM
   -M:  Chas Williams <[email protected]>
   +M:  Chas Williams <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    L:  [email protected]
    W:  http://linux-atm.sourceforge.net
@@@@@ -1765,7 -1764,7 -1765,7 -1762,7 +1765,7 @@@@@ S:  Supporte
    F:  drivers/tty/serial/atmel_serial.c
    
    ATMEL Audio ALSA driver
 - -M:  Bo Shen <voice.shen@atmel.com>
 + +M:  Nicolas Ferre <nicolas.ferre@atmel.com>
    L:  [email protected] (moderated for non-subscribers)
    S:  Supported
    F:  sound/soc/atmel
@@@@@ -1916,14 -1915,16 -1916,14 -1913,16 +1916,14 @@@@@ S:     Maintaine
    F:  drivers/media/radio/radio-aztech*
    
    B43 WIRELESS DRIVER
 - -M:  Stefano Brivio <[email protected]>
    L:  [email protected]
    L:  [email protected]
    W:  http://wireless.kernel.org/en/users/Drivers/b43
 - -S:  Maintained
 + +S:  Odd Fixes
    F:  drivers/net/wireless/b43/
    
    B43LEGACY WIRELESS DRIVER
    M:  Larry Finger <[email protected]>
 - -M:  Stefano Brivio <[email protected]>
    L:  [email protected]
    L:  [email protected]
    W:  http://wireless.kernel.org/en/users/Drivers/b43
@@@@@ -1966,10 -1967,10 -1966,10 -1965,10 +1966,10 @@@@@ F:     Documentation/filesystems/befs.tx
    F:  fs/befs/
    
    BECKHOFF CX5020 ETHERCAT MASTER DRIVER
 - -M: Dariusz Marcinkiewicz <[email protected]>
 - -L: [email protected]
 - -S: Maintained
 - -F: drivers/net/ethernet/ec_bhf.c
 + +M:  Dariusz Marcinkiewicz <[email protected]>
 + +L:  [email protected]
 + +S:  Maintained
 + +F:  drivers/net/ethernet/ec_bhf.c
    
    BFS FILE SYSTEM
    M:  "Tigran A. Aivazian" <[email protected]>
@@@@@ -2519,18 -2520,18 -2519,18 -2518,11 +2519,18 @@@@@ F:     Documentation/zh_CN
    
    CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
    M:  Peter Chen <[email protected]>
   -T:  git git://github.com/hzpeterchen/linux-usb.git
   +T:  git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
    L:  [email protected]
    S:  Maintained
    F:  drivers/usb/chipidea/
    
   +CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER
   +M:  Hans de Goede <[email protected]>
   +L:  [email protected]
   +S:  Maintained
   +F:  Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
   +F:  drivers/input/touchscreen/chipone_icn8318.c
   +
    CHROME HARDWARE PLATFORM SUPPORT
    M:  Olof Johansson <[email protected]>
    S:  Maintained
@@@@@ -2824,7 -2825,6 -2824,7 -2816,6 +2824,7 @@@@@ L:  [email protected]
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
    S:  Maintained
    F:  Documentation/crypto/
 + +F:  Documentation/DocBook/crypto-API.tmpl
    F:  arch/*/crypto/
    F:  crypto/
    F:  drivers/crypto/
@@@@@ -2895,11 -2895,11 -2895,11 -2886,11 +2895,11 @@@@@ S:     Supporte
    F:  drivers/net/ethernet/chelsio/cxgb3/
    
    CXGB3 ISCSI DRIVER (CXGB3I)
 - -M:      Karen Xie <[email protected]>
 - -L:      [email protected]
 - -W:      http://www.chelsio.com
 - -S:      Supported
 - -F:      drivers/scsi/cxgbi/cxgb3i
 + +M:  Karen Xie <[email protected]>
 + +L:  [email protected]
 + +W:  http://www.chelsio.com
 + +S:  Supported
 + +F:  drivers/scsi/cxgbi/cxgb3i
    
    CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
    M:  Steve Wise <[email protected]>
@@@@@ -2916,11 -2916,11 -2916,11 -2907,11 +2916,11 @@@@@ S:     Supporte
    F:  drivers/net/ethernet/chelsio/cxgb4/
    
    CXGB4 ISCSI DRIVER (CXGB4I)
 - -M:      Karen Xie <[email protected]>
 - -L:      [email protected]
 - -W:      http://www.chelsio.com
 - -S:      Supported
 - -F:      drivers/scsi/cxgbi/cxgb4i
 + +M:  Karen Xie <[email protected]>
 + +L:  [email protected]
 + +W:  http://www.chelsio.com
 + +S:  Supported
 + +F:  drivers/scsi/cxgbi/cxgb4i
    
    CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
    M:  Steve Wise <[email protected]>
@@@@@ -3146,15 -3146,15 -3146,15 -3137,12 +3146,15 @@@@@ S:     Supporte
    F:  Documentation/hwmon/da90??
    F:  drivers/gpio/gpio-da90??.c
    F:  drivers/hwmon/da90??-hwmon.c
   +F:  drivers/iio/adc/da91??-*.c
    F:  drivers/input/misc/da90??_onkey.c
    F:  drivers/input/touchscreen/da9052_tsi.c
    F:  drivers/leds/leds-da90??.c
    F:  drivers/mfd/da903x.c
    F:  drivers/mfd/da90??-*.c
   +F:  drivers/mfd/da91??-*.c
    F:  drivers/power/da9052-battery.c
   +F:  drivers/power/da91??-*.c
    F:  drivers/regulator/da903x.c
    F:  drivers/regulator/da9???-regulator.[ch]
    F:  drivers/rtc/rtc-da90??.c
@@@@@ -3164,7 -3164,7 -3164,7 -3152,6 +3164,7 @@@@@ F:  include/linux/mfd/da903x.
    F:  include/linux/mfd/da9052/
    F:  include/linux/mfd/da9055/
    F:  include/linux/mfd/da9063/
   +F:  include/linux/mfd/da9150/
    F:  include/sound/da[79]*.h
    F:  sound/soc/codecs/da[79]*.[ch]
    
@@@@@ -3265,19 -3265,13 -3265,19 -3252,12 +3265,13 @@@@@ S:     Maintaine
    F:  Documentation/hwmon/dme1737
    F:  drivers/hwmon/dme1737.c
    
   -DOCKING STATION DRIVER
   -M:  Shaohua Li <[email protected]>
   -L:  [email protected]
   -S:  Supported
   -F:  drivers/acpi/dock.c
   +DMI/SMBIOS SUPPORT
   +M:  Jean Delvare <[email protected]>
   +S:  Maintained
   +F:  drivers/firmware/dmi-id.c
   +F:  drivers/firmware/dmi_scan.c
   +F:  include/linux/dmi.h
    
- - DOCKING STATION DRIVER
- - M:  Shaohua Li <[email protected]>
- - L:  [email protected]
- - S:  Supported
- - F:  drivers/acpi/dock.c
- - 
    DOCUMENTATION
    M:  Jonathan Corbet <[email protected]>
    L:  [email protected]
@@@@@ -4176,12 -4170,12 -4176,12 -4156,6 +4170,12 @@@@@ F:      sound/soc/fsl/fsl
    F:  sound/soc/fsl/imx*
    F:  sound/soc/fsl/mpc8610_hpcd.c
    
   +FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
   +M:  J. German Rivera <[email protected]>
   +L:  [email protected]
   +S:  Maintained
   +F:  drivers/staging/fsl-mc/
   +
    FREEVXFS FILESYSTEM
    M:  Christoph Hellwig <[email protected]>
    W:  ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@@@@ -4331,15 -4325,15 -4331,15 -4305,6 +4325,15 @@@@@ S:      Supporte
    F:  drivers/phy/
    F:  include/linux/phy/
    
   +GENERIC PM DOMAINS
   +M:  "Rafael J. Wysocki" <[email protected]>
   +M:  Kevin Hilman <[email protected]>
   +M:  Ulf Hansson <[email protected]>
   +L:  [email protected]
   +S:  Supported
   +F:  drivers/base/power/domain*.c
   +F:  include/linux/pm_domain.h
   +
    GENERIC UIO DRIVER FOR PCI DEVICES
    M:  "Michael S. Tsirkin" <[email protected]>
    L:  [email protected]
@@@@@ -4353,10 -4347,10 -4353,10 -4318,10 +4347,10 @@@@@ F:     scripts/get_maintainer.p
    
    GFS2 FILE SYSTEM
    M:  Steven Whitehouse <[email protected]>
   +M:  Bob Peterson <[email protected]>
    L:  [email protected]
    W:  http://sources.redhat.com/cluster/
   -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git
   -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git
   +T:  git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
    S:  Supported
    F:  Documentation/filesystems/gfs2*.txt
    F:  fs/gfs2/
@@@@@ -4976,7 -4970,7 -4976,7 -4941,6 +4970,7 @@@@@ S:  Maintaine
    F:  drivers/iio/
    F:  drivers/staging/iio/
    F:  include/linux/iio/
   +F:  tools/iio/
    
    IKANOS/ADI EAGLE ADSL USB DRIVER
    M:  Matthieu Castet <[email protected]>
@@@@@ -5123,7 -5117,7 -5123,7 -5087,7 +5117,7 @@@@@ S:  Supporte
    F:  drivers/platform/x86/intel_menlow.c
    
    INTEL IA32 MICROCODE UPDATE SUPPORT
   -M:  Tigran Aivazian <[email protected]>
   +M:  Borislav Petkov <[email protected]>
    S:  Maintained
    F:  arch/x86/kernel/cpu/microcode/core*
    F:  arch/x86/kernel/cpu/microcode/intel*
@@@@@ -5164,21 -5158,21 -5164,21 -5128,22 +5158,21 @@@@@ M:     Deepak Saxena <[email protected]
    S:  Maintained
    F:  drivers/char/hw_random/ixp4xx-rng.c
    
   -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
   +INTEL ETHERNET DRIVERS
    M:  Jeff Kirsher <[email protected]>
   -M:  Jesse Brandeburg <[email protected]>
   -M:  Bruce Allan <[email protected]>
   -M:  Carolyn Wyborny <[email protected]>
   -M:  Don Skidmore <[email protected]>
   -M:  Greg Rose <[email protected]>
   -M:  Matthew Vick <[email protected]>
   -M:  John Ronciak <[email protected]>
   -M:  Mitch Williams <[email protected]>
   -M:  Linux NICS <[email protected]>
   -L:  [email protected]
   +R:  Jesse Brandeburg <[email protected]>
   +R:  Shannon Nelson <[email protected]>
   +R:  Carolyn Wyborny <[email protected]>
   +R:  Don Skidmore <[email protected]>
   +R:  Matthew Vick <[email protected]>
   +R:  John Ronciak <[email protected]>
   +R:  Mitch Williams <[email protected]>
   +L:  [email protected]
    W:  http://www.intel.com/support/feedback.htm
    W:  http://e1000.sourceforge.net/
   -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
   -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
   +Q:  http://patchwork.ozlabs.org/project/intel-wired-lan/list/
   +T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
   +T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
    S:  Supported
    F:  Documentation/networking/e100.txt
    F:  Documentation/networking/e1000.txt
@@@@@ -5222,7 -5216,7 -5222,7 -5187,7 +5216,7 @@@@@ F:  arch/x86/kernel/tboot.
    INTEL WIRELESS WIMAX CONNECTION 2400
    M:  Inaky Perez-Gonzalez <[email protected]>
    M:  [email protected]
 - -L:     [email protected] (subscribers-only)
 + +L:  [email protected] (subscribers-only)
    S:  Supported
    W:  http://linuxwimax.org
    F:  Documentation/wimax/README.i2400m
@@@@@ -5300,13 -5294,6 -5300,13 -5265,6 +5294,13 @@@@@ F:       drivers/char/ipmi
    F:  include/linux/ipmi*
    F:  include/uapi/linux/ipmi*
    
 + +QCOM AUDIO (ASoC) DRIVERS
 + +M:  Patrick Lai <[email protected]>
 + +M:  Banajit Goswami <[email protected]>
 + +L:  [email protected] (moderated for non-subscribers)
 + +S:  Supported
 + +F:  sound/soc/qcom/
 + +
    IPS SCSI RAID DRIVER
    M:  Adaptec OEM Raid Solutions <[email protected]>
    L:  [email protected]
@@@@@ -5627,8 -5614,8 -5627,8 -5585,6 +5621,8 @@@@@ S:  Supporte
    F:  Documentation/*/kvm*.txt
    F:  Documentation/virtual/kvm/
    F:  arch/*/kvm/
   +F:  arch/x86/kernel/kvm.c
   +F:  arch/x86/kernel/kvmclock.c
    F:  arch/*/include/asm/kvm*
    F:  include/linux/kvm*
    F:  include/uapi/linux/kvm*
@@@@@ -5925,7 -5912,7 -5925,7 -5881,7 +5919,7 @@@@@ F:  arch/powerpc/platforms/512x
    F:  arch/powerpc/platforms/52xx/
    
    LINUX FOR POWERPC EMBEDDED PPC4XX
 - -M:  Alistair Popple <[email protected]>
 + +M:  Alistair Popple <[email protected]>
    M:  Matt Porter <[email protected]>
    W:  http://www.penguinppc.org/
    L:  [email protected]
@@@@@ -6360,7 -6347,6 -6360,7 -6316,6 +6354,7 @@@@@ F:  drivers/scsi/megaraid
    
    MELLANOX ETHERNET DRIVER (mlx4_en)
    M:  Amir Vadai <[email protected]>
 + +M:  Ido Shamay <[email protected]>
    L:  [email protected]
    S:  Supported
    W:  http://www.mellanox.com
@@@@@ -6398,7 -6384,7 -6398,7 -6353,7 +6392,7 @@@@@ S:  Supporte
    F:  drivers/watchdog/mena21_wdt.c
    
    MEN CHAMELEON BUS (mcb)
 - -M:          Johannes Thumshirn <[email protected]>
 + +M:  Johannes Thumshirn <[email protected]>
    S:  Supported
    F:  drivers/mcb/
    F:  include/linux/mcb.h
@@@@@ -6603,8 -6589,8 -6603,8 -6558,10 +6597,8 @@@@@ F: drivers/mfd
    F:  include/linux/mfd/
    
    MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
   -M:  Chris Ball <[email protected]>
    M:  Ulf Hansson <[email protected]>
    L:  [email protected]
   -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
    T:  git git://git.linaro.org/people/ulf.hansson/mmc.git
    S:  Maintained
    F:  drivers/mmc/
@@@@@ -6980,13 -6966,6 -6980,13 -6937,6 +6974,13 @@@@@ S:       Supporte
    F:  drivers/block/nvme*
    F:  include/linux/nvme.h
    
 + +NXP-NCI NFC DRIVER
 + +M:  Clément Perrochaud <[email protected]>
 + +R:  Charles Gorand <[email protected]>
 + +L:  [email protected] (moderated for non-subscribers)
 + +S:  Supported
 + +F:  drivers/nfc/nxp-nci
 + +
    NXP TDA998X DRM DRIVER
    M:  Russell King <[email protected]>
    S:  Supported
@@@@@ -7954,10 -7933,10 -7954,10 -7904,10 +7948,10 @@@@@ L:     [email protected]
    S:  Maintained
    
    QAT DRIVER
 - -M:      Tadeusz Struk <[email protected]>
 - -L:      [email protected]
 - -S:      Supported
 - -F:      drivers/crypto/qat/
 + +M:  Tadeusz Struk <[email protected]>
 + +L:  [email protected]
 + +S:  Supported
 + +F:  drivers/crypto/qat/
    
    QIB DRIVER
    M:  Mike Marciniszyn <[email protected]>
@@@@@ -8108,7 -8087,7 -8108,7 -8058,7 +8102,7 @@@@@ S:  Maintaine
    F:  drivers/net/wireless/rt2x00/
    
    RAMDISK RAM BLOCK DEVICE DRIVER
 - -M:  Nick Piggin <npiggin@kernel.dk>
 + +M:  Jens Axboe <axboe@kernel.dk>
    S:  Maintained
    F:  Documentation/blockdev/ramdisk.txt
    F:  drivers/block/brd.c
@@@@@ -8184,7 -8163,6 -8184,7 -8134,6 +8178,7 @@@@@ X:  kernel/torture.
    
    REAL TIME CLOCK (RTC) SUBSYSTEM
    M:  Alessandro Zummo <[email protected]>
 + +M:  Alexandre Belloni <[email protected]>
    L:  [email protected]
    Q:  http://patchwork.ozlabs.org/project/rtc-linux/list/
    S:  Maintained
@@@@@ -8396,6 -8374,7 -8396,6 -8345,7 +8390,6 @@@@@ F:  block/partitions/ibm.
    
    S390 NETWORK DRIVERS
    M:  Ursula Braun <[email protected]>
 - -M:  Frank Blaschka <[email protected]>
    M:  [email protected]
    L:  [email protected]
    W:  http://www.ibm.com/developerworks/linux/linux390/
@@@@@ -8603,7 -8582,7 -8603,7 -8553,6 +8597,7 @@@@@ F:  include/uapi/linux/timex.
    F:  kernel/time/clocksource.c
    F:  kernel/time/time*.c
    F:  kernel/time/ntp.c
   +F:  tools/testing/selftests/timers/
    
    SC1200 WDT DRIVER
    M:  Zwane Mwaikambo <[email protected]>
@@@@@ -8655,9 -8634,11 -8655,9 -8604,11 +8649,9 @@@@@ F:        drivers/scsi/sg.
    F:  include/scsi/sg.h
    
    SCSI SUBSYSTEM
 - -M:  "James E.J. Bottomley" <JBottomley@parallels.com>
 + +M:  "James E.J. Bottomley" <JBottomley@odin.com>
    L:  [email protected]
 - -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 - -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
 - -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
 + +T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
    S:  Maintained
    F:  drivers/scsi/
    F:  include/scsi/
@@@@@ -8710,8 -8691,8 -8710,8 -8661,10 +8704,8 @@@@@ S: Maintaine
    F:  drivers/mmc/host/sdricoh_cs.c
    
    SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
   -M:  Chris Ball <[email protected]>
    L:  [email protected]
   -T:  git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
   -S:  Maintained
   +S:  Orphan
    F:  drivers/mmc/host/sdhci.*
    F:  drivers/mmc/host/sdhci-pltfm.[ch]
    
@@@@@ -8727,12 -8708,12 -8727,12 -8680,18 +8721,12 @@@@@ F:     include/linux/seccomp.
    K:  \bsecure_computing
    K:  \bTIF_SECCOMP\b
    
   -SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
   -M:  Anton Vorontsov <[email protected]>
   -L:  [email protected]
   -L:  [email protected]
   -S:  Maintained
   -F:  drivers/mmc/host/sdhci-pltfm.[ch]
   -
    SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
    M:  Ben Dooks <[email protected]>
   +M:  Jaehoon Chung <[email protected]>
    L:  [email protected]
    S:  Maintained
   -F:  drivers/mmc/host/sdhci-s3c.c
   +F:  drivers/mmc/host/sdhci-s3c*
    
    SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
    M:  Viresh Kumar <[email protected]>
@@@@@ -9399,14 -9380,14 -9399,14 -9358,6 +9393,14 @@@@@ L:      [email protected]
    S:  Maintained
    F:  drivers/staging/sm7xxfb/
    
   +STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
   +M:  Sudip Mukherjee <[email protected]>
   +M:  Teddy Wang <[email protected]>
   +M:  Sudip Mukherjee <[email protected]>
   +L:  [email protected]
   +S:  Maintained
   +F:  drivers/staging/sm750fb/
   +
    STAGING - SLICOSS
    M:  Lior Dotan <[email protected]>
    M:  Christopher Harrer <[email protected]>
@@@@@ -9869,7 -9850,7 -9869,7 -9820,7 +9863,7 @@@@@ F:  include/linux/wl12xx.
    
    TIPC NETWORK LAYER
    M:  Jon Maloy <[email protected]>
 - -M:  Allan Stephens <allan.stephens@windriver.com>
 + +M:  Ying Xue <ying.xue@windriver.com>
    L:  [email protected] (core kernel code)
    L:  [email protected] (user apps, general discussion)
    W:  http://tipc.sourceforge.net/
@@@@@ -9973,7 -9954,6 -9973,7 -9924,6 +9967,7 @@@@@ F:  drivers/media/pci/tw68
    TPM DEVICE DRIVER
    M:  Peter Huewe <[email protected]>
    M:  Marcel Selhorst <[email protected]>
 + +R:  Jason Gunthorpe <[email protected]>
    W:  http://tpmdd.sourceforge.net
    L:  [email protected] (moderated for non-subscribers)
    Q:  git git://github.com/PeterHuewe/linux-tpmdd.git
@@@@@ -10127,11 -10107,11 -10127,11 -10077,11 +10121,11 @@@@@ F:        include/linux/cdrom.
    F:  include/uapi/linux/cdrom.h
    
    UNISYS S-PAR DRIVERS
 - -M:     Benjamin Romer <[email protected]>
 - -M:     David Kershner <[email protected]>
 - -L:     [email protected] (Unisys internal)
 - -S:     Supported
 - -F:     drivers/staging/unisys/
 + +M:  Benjamin Romer <[email protected]>
 + +M:  David Kershner <[email protected]>
 + +L:  [email protected] (Unisys internal)
 + +S:  Supported
 + +F:  drivers/staging/unisys/
    
    UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
    M:  Vinayak Holikatti <[email protected]>
@@@@@ -10179,12 -10159,12 -10179,12 -10129,6 +10173,12 @@@@@ S: Maintaine
    F:  drivers/net/usb/cdc_*.c
    F:  include/uapi/linux/usb/cdc.h
    
   +USB CHAOSKEY DRIVER
   +M:  Keith Packard <[email protected]>
   +L:  [email protected]
   +S:  Maintained
   +F:  drivers/usb/misc/chaoskey.c
   +
    USB CYPRESS C67X00 DRIVER
    M:  Peter Korsgaard <[email protected]>
    L:  [email protected]
@@@@@ -10263,13 -10243,13 -10263,13 -10207,6 +10257,13 @@@@@ S: Maintaine
    F:  Documentation/usb/ohci.txt
    F:  drivers/usb/host/ohci*
    
   +USB OTG FSM (Finite State Machine)
   +M:  Peter Chen <[email protected]>
   +T:  git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
   +L:  [email protected]
   +S:  Maintained
   +F:  drivers/usb/common/usb-otg-fsm.c
   +
    USB OVER IP DRIVER
    M:  Valentina Manea <[email protected]>
    M:  Shuah Khan <[email protected]>
@@@@@ -10688,7 -10668,7 -10688,7 -10625,7 +10682,7 @@@@@ F:     drivers/media/rc/winbond-cir.
    WIMAX STACK
    M:  Inaky Perez-Gonzalez <[email protected]>
    M:  [email protected]
 - -L:     [email protected] (subscribers-only)
 + +L:  [email protected] (subscribers-only)
    S:  Supported
    W:  http://linuxwimax.org
    F:  Documentation/wimax/README.wimax
@@@@@ -10979,7 -10959,6 -10979,7 -10916,6 +10973,7 @@@@@ L:     [email protected]
    S:  Maintained
    F:  mm/zsmalloc.c
    F:  include/linux/zsmalloc.h
 + +F:  Documentation/vm/zsmalloc.txt
    
    ZSWAP COMPRESSED SWAP CACHING
    M:  Seth Jennings <[email protected]>