1 files changed, 92 insertions, 41 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f705c6c1b105..17631e6c0151 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -637,8 +637,7 @@ 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 +724,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
@@ -1030,6 +1029,16 @@ F:	arch/arm/mach-mxs/
 F:      arch/arm/boot/dts/imx*
 F:      arch/arm/configs/imx*_defconfig
 
+ARM/FREESCALE VYBRID ARM ARCHITECTURE
+M:      Shawn Guo <shawn.guo@linaro.org>
+M:      Sascha Hauer <kernel@pengutronix.de>
+R:      Stefan Agner <stefan@agner.ch>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
+F:      arch/arm/mach-imx/*vf610*
+F:      arch/arm/boot/dts/vf*
+
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1176,7 +1185,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>
@@ -1188,6 +1197,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
 M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+M:      Gregory Clement <gregory.clement@free-electrons.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-dove/
@@ -1351,6 +1361,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>
@@ -1457,6 +1468,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
@@ -1664,8 +1677,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/
@@ -1730,7 +1743,7 @@ S:	Maintained
 F:      drivers/net/ethernet/atheros/
 
 ATM
-M:      Chas Williams <chas@cmf.nrl.navy.mil>
+M:      Chas Williams <3chas3@gmail.com>
 L:      linux-atm-general@lists.sourceforge.net (moderated for non-subscribers)
 L:      netdev@vger.kernel.org
 W:      http://linux-atm.sourceforge.net
@@ -2065,7 +2078,7 @@ F:	include/net/bluetooth/
 BONDING DRIVER
 M:      Jay Vosburgh <j.vosburgh@gmail.com>
 M:      Veaceslav Falico <vfalico@gmail.com>
-M:      Andy Gospodarek <andy@greyhouse.net>
+M:      Andy Gospodarek <gospo@cumulusnetworks.com>
 L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/bonding/
 S:      Supported
@@ -2107,7 +2120,6 @@ F:	drivers/net/ethernet/broadcom/bnx2x/
 
 BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:      Christian Daudt <bcm@fixthebug.org>
-M:      Matt Porter <mporter@linaro.org>
 M:      Florian Fainelli <f.fainelli@gmail.com>
 L:      bcm-kernel-feedback-list@broadcom.com
 T:      git git://github.com/broadcom/mach-bcm
@@ -2369,8 +2381,9 @@ F:	arch/x86/include/asm/tce.h
 
 CAN NETWORK LAYER
 M:      Oliver Hartkopp <socketcan@hartkopp.net>
+M:      Marc Kleine-Budde <mkl@pengutronix.de>
 L:      linux-can@vger.kernel.org
-W:      http://gitorious.org/linux-can
+W:      https://github.com/linux-can
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 S:      Maintained
@@ -2386,7 +2399,7 @@ CAN NETWORK DRIVERS
 M:      Wolfgang Grandegger <wg@grandegger.com>
 M:      Marc Kleine-Budde <mkl@pengutronix.de>
 L:      linux-can@vger.kernel.org
-W:      http://gitorious.org/linux-can
+W:      https://github.com/linux-can
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 S:      Maintained
@@ -2507,7 +2520,7 @@ 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/
@@ -3126,12 +3139,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
@@ -3141,6 +3157,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]
 
@@ -3241,6 +3258,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
@@ -4145,6 +4169,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
@@ -4930,6 +4960,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>
@@ -5076,7 +5107,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*
@@ -5117,22 +5148,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
@@ -5574,6 +5604,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*
@@ -6547,10 +6579,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/
@@ -7213,8 +7243,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M:      Mark Fasheh <mfasheh@suse.com>
 M:      Joel Becker <jlbec@evilplan.org>
 L:      ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
-W:      http://oss.oracle.com/projects/ocfs2/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
+W:      http://ocfs2.wiki.kernel.org
 S:      Supported
 F:      Documentation/filesystems/ocfs2.txt
 F:      Documentation/filesystems/dlmfs.txt
@@ -8481,6 +8510,14 @@ S:	Supported
 L:      netdev@vger.kernel.org
 F:      drivers/net/ethernet/samsung/sxgbe/
 
+SAMSUNG THERMAL DRIVER
+M:      Lukasz Majewski <l.majewski@samsung.com>
+L:      linux-pm@vger.kernel.org
+L:      linux-samsung-soc@vger.kernel.org
+S:      Supported
+T:      https://github.com/lmajewski/linux-samsung-thermal.git
+F:      drivers/thermal/samsung/
+
 SAMSUNG USB2 PHY DRIVER
 M:      Kamil Debski <k.debski@samsung.com>
 L:      linux-kernel@vger.kernel.org
@@ -8535,6 +8572,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>
@@ -8643,10 +8681,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]
 
@@ -8662,18 +8698,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>
@@ -9340,6 +9370,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>
@@ -10111,6 +10149,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
@@ -10189,6 +10233,13 @@ S:	Maintained
 F:      Documentation/usb/ohci.txt
 F:      drivers/usb/host/ohci*
 
+USB OTG FSM (Finite State Machine)
+M:      Peter Chen <Peter.Chen@freescale.com>
+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
+
 USB OVER IP DRIVER
 M:      Valentina Manea <valentina.manea.m@gmail.com>
 M:      Shuah Khan <shuah.kh@samsung.com>