1 files changed, 166 insertions, 86 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e9e12d75546a..d4aaab5ea139 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -569,6 +569,12 @@ L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:      Maintained
 F:      drivers/mailbox/mailbox-altera.c
 
+ALTERA PIO DRIVER
+M:      Tien Hock Loh <thloh@altera.com>
+L:      linux-gpio@vger.kernel.org
+S:      Maintained
+F:      drivers/gpio/gpio-altera.c
+
 ALTERA TRIPLE SPEED ETHERNET DRIVER
 M:      Vince Bridgers <vbridger@opensource.altera.com>
 L:      netdev@vger.kernel.org
@@ -625,20 +631,19 @@ F:	drivers/iommu/amd_iommu*.[ch]
 F:      include/linux/amd-iommu.h
 
 AMD KFD
-M:      Oded Gabbay <oded.gabbay@amd.com>
-L:      dri-devel@lists.freedesktop.org
-T:      git git://people.freedesktop.org/~gabbayo/linux.git
-S:      Supported
-F:      drivers/gpu/drm/amd/amdkfd/
+M:      Oded Gabbay <oded.gabbay@amd.com>
+L:      dri-devel@lists.freedesktop.org
+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 <herrmann.der.user@googlemail.com>
-L:      amd64-microcode@amd64.org
+M:      Borislav Petkov <bp@alien8.de>
 S:      Maintained
 F:      arch/x86/kernel/cpu/microcode/amd*
 
@@ -725,7 +730,7 @@ F:	staging/iio/trigger/iio-trig-bfin-timer.c
 
 ANDROID DRIVERS
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-M:      Arve Hjønnevåg <arve@android.com>
+M:      Arve Hjønnevåg <arve@android.com>
 M:      Riley Andrews <riandrews@android.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
 L:      devel@driverdev.osuosl.org
@@ -1186,7 +1191,7 @@ M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (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 <sebastian.hesselbarth@gmail.com>
@@ -1216,6 +1221,7 @@ F:	arch/arm/mach-orion5x/ts78xx-*
 ARM/Mediatek SoC support
 M:      Matthias Brugger <matthias.bgg@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:      linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/boot/dts/mt6*
 F:      arch/arm/boot/dts/mt8*
@@ -1362,6 +1368,7 @@ F:	drivers/i2c/busses/i2c-rk3x.c
 F:      drivers/*/*rockchip*
 F:      drivers/*/*/*rockchip*
 F:      sound/soc/rockchip/
+N:      rockchip
 
 ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
 M:      Kukjin Kim <kgene@kernel.org>
@@ -1468,6 +1475,8 @@ F:	drivers/clocksource/arm_global_timer.c
 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
@@ -1675,8 +1684,8 @@ F:	drivers/misc/eeprom/at24.c
 F:      include/linux/platform_data/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
-M:      "Ed L. Cashin" <ecashin@coraid.com>
-W:      http://support.coraid.com/support/linux
+M:      "Ed L. Cashin" <ed.cashin@acm.org>
+W:      http://www.openaoe.org/
 S:      Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
@@ -1762,7 +1771,7 @@ S:	Supported
 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:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/atmel
@@ -1913,16 +1922,14 @@ S:	Maintained
 F:      drivers/media/radio/radio-aztech*
 
 B43 WIRELESS DRIVER
-M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
 L:      b43-dev@lists.infradead.org
 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 <Larry.Finger@lwfinger.net>
-M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
 L:      b43-dev@lists.infradead.org
 W:      http://wireless.kernel.org/en/users/Drivers/b43
@@ -1965,10 +1972,10 @@ F:	Documentation/filesystems/befs.txt
 F:      fs/befs/
 
 BECKHOFF CX5020 ETHERCAT MASTER DRIVER
-M: Dariusz Marcinkiewicz <reksio@newterm.pl>
-L: netdev@vger.kernel.org
-S: Maintained
-F: drivers/net/ethernet/ec_bhf.c
+M:      Dariusz Marcinkiewicz <reksio@newterm.pl>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/ethernet/ec_bhf.c
 
 BFS FILE SYSTEM
 M:      "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
@@ -2518,11 +2525,18 @@ F:	Documentation/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 M:      Peter Chen <Peter.Chen@freescale.com>
-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:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      drivers/usb/chipidea/
 
+CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER
+M:      Hans de Goede <hdegoede@redhat.com>
+L:      linux-input@vger.kernel.org
+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 <olof@lixom.net>
 S:      Maintained
@@ -2563,6 +2577,7 @@ F:	include/linux/cleancache.h
 
 CLK API
 M:      Russell King <linux@arm.linux.org.uk>
+L:      linux-clk@vger.kernel.org
 S:      Maintained
 F:      include/linux/clk.h
 
@@ -2623,7 +2638,7 @@ F:	drivers/media/platform/coda/
 COMMON CLK FRAMEWORK
 M:      Mike Turquette <mturquette@linaro.org>
 M:      Stephen Boyd <sboyd@codeaurora.org>
-L:      linux-kernel@vger.kernel.org
+L:      linux-clk@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:      Maintained
 F:      drivers/clk/
@@ -2816,6 +2831,7 @@ L:	linux-crypto@vger.kernel.org
 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/
@@ -2886,11 +2902,11 @@ S:	Supported
 F:      drivers/net/ethernet/chelsio/cxgb3/
 
 CXGB3 ISCSI DRIVER (CXGB3I)
-M:      Karen Xie <kxie@chelsio.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.chelsio.com
-S:      Supported
-F:      drivers/scsi/cxgbi/cxgb3i
+M:      Karen Xie <kxie@chelsio.com>
+L:      linux-scsi@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/scsi/cxgbi/cxgb3i
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 M:      Steve Wise <swise@chelsio.com>
@@ -2907,11 +2923,11 @@ S:	Supported
 F:      drivers/net/ethernet/chelsio/cxgb4/
 
 CXGB4 ISCSI DRIVER (CXGB4I)
-M:      Karen Xie <kxie@chelsio.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.chelsio.com
-S:      Supported
-F:      drivers/scsi/cxgbi/cxgb4i
+M:      Karen Xie <kxie@chelsio.com>
+L:      linux-scsi@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/scsi/cxgbi/cxgb4i
 
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 M:      Steve Wise <swise@chelsio.com>
@@ -3137,12 +3153,15 @@ S:	Supported
 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
@@ -3152,6 +3171,7 @@ F:	include/linux/mfd/da903x.h
 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]
 
@@ -3252,6 +3272,13 @@ S:	Maintained
 F:      Documentation/hwmon/dme1737
 F:      drivers/hwmon/dme1737.c
 
+DMI/SMBIOS SUPPORT
+M:      Jean Delvare <jdelvare@suse.de>
+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 <shaohua.li@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -3265,7 +3292,9 @@ S:	Maintained
 F:      Documentation/
 X:      Documentation/ABI/
 X:      Documentation/devicetree/
-X:      Documentation/[a-z][a-z]_[A-Z][A-Z]/
+X:      Documentation/acpi
+X:      Documentation/power
+X:      Documentation/spi
 T:      git git://git.lwn.net/linux-2.6.git docs-next
 
 DOUBLETALK DRIVER
@@ -3389,7 +3418,6 @@ T:	git git://people.freedesktop.org/~airlied/linux
 S:      Supported
 F:      drivers/gpu/drm/rcar-du/
 F:      drivers/gpu/drm/shmobile/
-F:      include/linux/platform_data/rcar-du.h
 F:      include/linux/platform_data/shmob_drm.h
 
 DSBR100 USB FM RADIO DRIVER
@@ -4156,6 +4184,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 <German.Rivera@freescale.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/fsl-mc/
+
 FREEVXFS FILESYSTEM
 M:      Christoph Hellwig <hch@infradead.org>
 W:      ftp://ftp.openlinux.org/pub/people/hch/vxfs
@@ -4305,6 +4339,15 @@ S:	Supported
 F:      drivers/phy/
 F:      include/linux/phy/
 
+GENERIC PM DOMAINS
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:      Kevin Hilman <khilman@kernel.org>
+M:      Ulf Hansson <ulf.hansson@linaro.org>
+L:      linux-pm@vger.kernel.org
+S:      Supported
+F:      drivers/base/power/domain*.c
+F:      include/linux/pm_domain.h
+
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
@@ -4318,10 +4361,10 @@ F:	scripts/get_maintainer.pl
 
 GFS2 FILE SYSTEM
 M:      Steven Whitehouse <swhiteho@redhat.com>
+M:      Bob Peterson <rpeterso@redhat.com>
 L:      cluster-devel@redhat.com
 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/
@@ -4941,6 +4984,7 @@ S:	Maintained
 F:      drivers/iio/
 F:      drivers/staging/iio/
 F:      include/linux/iio/
+F:      tools/iio/
 
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:      Matthieu Castet <castet.matthieu@free.fr>
@@ -5087,7 +5131,7 @@ S:	Supported
 F:      drivers/platform/x86/intel_menlow.c
 
 INTEL IA32 MICROCODE UPDATE SUPPORT
-M:      Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
+M:      Borislav Petkov <bp@alien8.de>
 S:      Maintained
 F:      arch/x86/kernel/cpu/microcode/core*
 F:      arch/x86/kernel/cpu/microcode/intel*
@@ -5128,22 +5172,21 @@ M:	Deepak Saxena <dsaxena@plexity.net>
 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 <jeffrey.t.kirsher@intel.com>
-M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
-M:      Bruce Allan <bruce.w.allan@intel.com>
-M:      Carolyn Wyborny <carolyn.wyborny@intel.com>
-M:      Don Skidmore <donald.c.skidmore@intel.com>
-M:      Greg Rose <gregory.v.rose@intel.com>
-M:      Matthew Vick <matthew.vick@intel.com>
-M:      John Ronciak <john.ronciak@intel.com>
-M:      Mitch Williams <mitch.a.williams@intel.com>
-M:      Linux NICS <linux.nics@intel.com>
-L:      e1000-devel@lists.sourceforge.net
+R:      Jesse Brandeburg <jesse.brandeburg@intel.com>
+R:      Shannon Nelson <shannon.nelson@intel.com>
+R:      Carolyn Wyborny <carolyn.wyborny@intel.com>
+R:      Don Skidmore <donald.c.skidmore@intel.com>
+R:      Matthew Vick <matthew.vick@intel.com>
+R:      John Ronciak <john.ronciak@intel.com>
+R:      Mitch Williams <mitch.a.williams@intel.com>
+L:      intel-wired-lan@lists.osuosl.org
 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
@@ -5187,7 +5230,7 @@ F:	arch/x86/kernel/tboot.c
 INTEL WIRELESS WIMAX CONNECTION 2400
 M:      Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:      linux-wimax@intel.com
-L:     wimax@linuxwimax.org (subscribers-only)
+L:      wimax@linuxwimax.org (subscribers-only)
 S:      Supported
 W:      http://linuxwimax.org
 F:      Documentation/wimax/README.i2400m
@@ -5265,6 +5308,13 @@ F:	drivers/char/ipmi/
 F:      include/linux/ipmi*
 F:      include/uapi/linux/ipmi*
 
+QCOM AUDIO (ASoC) DRIVERS
+M:      Patrick Lai <plai@codeaurora.org>
+M:      Banajit Goswami <bgoswami@codeaurora.org>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Supported
+F:      sound/soc/qcom/
+
 IPS SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -5585,6 +5635,8 @@ S:	Supported
 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*
@@ -5881,7 +5933,7 @@ F:	arch/powerpc/platforms/512x/
 F:      arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
-M:  Alistair Popple <alistair@popple.id.au>
+M:      Alistair Popple <alistair@popple.id.au>
 M:      Matt Porter <mporter@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@lists.ozlabs.org
@@ -6316,6 +6368,7 @@ F:	drivers/scsi/megaraid/
 
 MELLANOX ETHERNET DRIVER (mlx4_en)
 M:      Amir Vadai <amirv@mellanox.com>
+M:      Ido Shamay <idos@mellanox.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 W:      http://www.mellanox.com
@@ -6353,7 +6406,7 @@ S:	Supported
 F:      drivers/watchdog/mena21_wdt.c
 
 MEN CHAMELEON BUS (mcb)
-M:      Johannes Thumshirn <johannes.thumshirn@men.de>
+M:      Johannes Thumshirn <johannes.thumshirn@men.de>
 S:      Supported
 F:      drivers/mcb/
 F:      include/linux/mcb.h
@@ -6558,10 +6611,8 @@ F:	drivers/mfd/
 F:      include/linux/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
-M:      Chris Ball <chris@printf.net>
 M:      Ulf Hansson <ulf.hansson@linaro.org>
 L:      linux-mmc@vger.kernel.org
-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/
@@ -6937,6 +6988,13 @@ S:	Supported
 F:      drivers/block/nvme*
 F:      include/linux/nvme.h
 
+NXP-NCI NFC DRIVER
+M:      Clément Perrochaud <clement.perrochaud@effinnov.com>
+R:      Charles Gorand <charles.gorand@effinnov.com>
+L:      linux-nfc@lists.01.org (moderated for non-subscribers)
+S:      Supported
+F:      drivers/nfc/nxp-nci
+
 NXP TDA998X DRM DRIVER
 M:      Russell King <rmk+kernel@arm.linux.org.uk>
 S:      Supported
@@ -7187,6 +7245,15 @@ F:	Documentation/devicetree/
 F:      arch/*/boot/dts/
 F:      include/dt-bindings/
 
+OPEN FIRMWARE AND DEVICE TREE OVERLAYS
+M:      Pantelis Antoniou <pantelis.antoniou@konsulko.com>
+L:      devicetree@vger.kernel.org
+S:      Maintained
+F:      Documentation/devicetree/dynamic-resolution-notes.txt
+F:      Documentation/devicetree/overlay-notes.txt
+F:      drivers/of/overlay.c
+F:      drivers/of/resolver.c
+
 OPENRISC ARCHITECTURE
 M:      Jonas Bonn <jonas@southpole.se>
 W:      http://openrisc.net
@@ -7904,10 +7971,10 @@ L:	rtc-linux@googlegroups.com
 S:      Maintained
 
 QAT DRIVER
-M:      Tadeusz Struk <tadeusz.struk@intel.com>
-L:      qat-linux@intel.com
-S:      Supported
-F:      drivers/crypto/qat/
+M:      Tadeusz Struk <tadeusz.struk@intel.com>
+L:      qat-linux@intel.com
+S:      Supported
+F:      drivers/crypto/qat/
 
 QIB DRIVER
 M:      Mike Marciniszyn <infinipath@intel.com>
@@ -8058,11 +8125,17 @@ S:	Maintained
 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
 
+PERSISTENT MEMORY DRIVER
+M:      Ross Zwisler <ross.zwisler@linux.intel.com>
+L:      linux-nvdimm@lists.01.org
+S:      Supported
+F:      drivers/block/pmem.c
+
 RANDOM NUMBER DRIVER
 M:      "Theodore Ts'o" <tytso@mit.edu>
 S:      Maintained
@@ -8134,6 +8207,7 @@ X:	kernel/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:      Alessandro Zummo <a.zummo@towertech.it>
+M:      Alexandre Belloni <alexandre.belloni@free-electrons.com>
 L:      rtc-linux@googlegroups.com
 Q:      http://patchwork.ozlabs.org/project/rtc-linux/list/
 S:      Maintained
@@ -8345,7 +8419,6 @@ F:	block/partitions/ibm.c
 
 S390 NETWORK DRIVERS
 M:      Ursula Braun <ursula.braun@de.ibm.com>
-M:      Frank Blaschka <blaschka@linux.vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -8553,6 +8626,7 @@ F:	include/uapi/linux/timex.h
 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 <zwanem@gmail.com>
@@ -8604,11 +8678,9 @@ F:	drivers/scsi/sg.c
 F:      include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:      "James E.J. Bottomley" <JBottomley@parallels.com>
+M:      "James E.J. Bottomley" <JBottomley@odin.com>
 L:      linux-scsi@vger.kernel.org
-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/
@@ -8661,10 +8733,8 @@ S:	Maintained
 F:      drivers/mmc/host/sdricoh_cs.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
-M:      Chris Ball <chris@printf.net>
 L:      linux-mmc@vger.kernel.org
-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]
 
@@ -8680,18 +8750,12 @@ F:	include/linux/seccomp.h
 K:      \bsecure_computing
 K:      \bTIF_SECCOMP\b
 
-SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
-M:      Anton Vorontsov <anton@enomsg.org>
-L:      linuxppc-dev@lists.ozlabs.org
-L:      linux-mmc@vger.kernel.org
-S:      Maintained
-F:      drivers/mmc/host/sdhci-pltfm.[ch]
-
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
 M:      Ben Dooks <ben-linux@fluff.org>
+M:      Jaehoon Chung <jh80.chung@samsung.com>
 L:      linux-mmc@vger.kernel.org
 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 <viresh.linux@gmail.com>
@@ -9358,6 +9422,14 @@ L:	linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/staging/sm7xxfb/
 
+STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
+M:      Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+M:      Teddy Wang <teddy.wang@siliconmotion.com>
+M:      Sudip Mukherjee <sudip@vectorindia.org>
+L:      linux-fbdev@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/sm750fb/
+
 STAGING - SLICOSS
 M:      Lior Dotan <liodot@gmail.com>
 M:      Christopher Harrer <charrer@alacritech.com>
@@ -9820,7 +9892,7 @@ F:	include/linux/wl12xx.h
 
 TIPC NETWORK LAYER
 M:      Jon Maloy <jon.maloy@ericsson.com>
-M:      Allan Stephens <allan.stephens@windriver.com>
+M:      Ying Xue <ying.xue@windriver.com>
 L:      netdev@vger.kernel.org (core kernel code)
 L:      tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 W:      http://tipc.sourceforge.net/
@@ -9924,6 +9996,7 @@ F:	drivers/media/pci/tw68/
 TPM DEVICE DRIVER
 M:      Peter Huewe <peterhuewe@gmx.de>
 M:      Marcel Selhorst <tpmdd@selhorst.net>
+R:      Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
 W:      http://tpmdd.sourceforge.net
 L:      tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 Q:      git git://github.com/PeterHuewe/linux-tpmdd.git
@@ -10077,11 +10150,11 @@ F:	include/linux/cdrom.h
 F:      include/uapi/linux/cdrom.h
 
 UNISYS S-PAR DRIVERS
-M:     Benjamin Romer <benjamin.romer@unisys.com>
-M:     David Kershner <david.kershner@unisys.com>
-L:     sparmaintainer@unisys.com (Unisys internal)
-S:     Supported
-F:     drivers/staging/unisys/
+M:      Benjamin Romer <benjamin.romer@unisys.com>
+M:      David Kershner <david.kershner@unisys.com>
+L:      sparmaintainer@unisys.com (Unisys internal)
+S:      Supported
+F:      drivers/staging/unisys/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 M:      Vinayak Holikatti <vinholikatti@gmail.com>
@@ -10129,6 +10202,12 @@ S:	Maintained
 F:      drivers/net/usb/cdc_*.c
 F:      include/uapi/linux/usb/cdc.h
 
+USB CHAOSKEY DRIVER
+M:      Keith Packard <keithp@keithp.com>
+L:      linux-usb@vger.kernel.org
+S:      Maintained
+F:      drivers/usb/misc/chaoskey.c
+
 USB CYPRESS C67X00 DRIVER
 M:      Peter Korsgaard <jacmet@sunsite.dk>
 L:      linux-usb@vger.kernel.org
@@ -10209,7 +10288,7 @@ F:	drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
 M:      Peter Chen <Peter.Chen@freescale.com>
-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:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      drivers/usb/common/usb-otg-fsm.c
@@ -10632,7 +10711,7 @@ F:	drivers/media/rc/winbond-cir.c
 WIMAX STACK
 M:      Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:      linux-wimax@intel.com
-L:     wimax@linuxwimax.org (subscribers-only)
+L:      wimax@linuxwimax.org (subscribers-only)
 S:      Supported
 W:      http://linuxwimax.org
 F:      Documentation/wimax/README.wimax
@@ -10923,6 +11002,7 @@ L:	linux-mm@kvack.org
 S:      Maintained
 F:      mm/zsmalloc.c
 F:      include/linux/zsmalloc.h
+F:      Documentation/vm/zsmalloc.txt
 
 ZSWAP COMPRESSED SWAP CACHING
 M:      Seth Jennings <sjennings@variantweb.net>