Merge remote-tracking branch 'wireless-next/master' into mac80211-next

1 files changed, 249 insertions, 126 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index da6cf1676f2c..bdf13e400450 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -237,11 +237,11 @@ F:	drivers/platform/x86/acer-wmi.c
 
 ACPI
 M:      Len Brown <lenb@kernel.org>
-M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
-Q:      http://patchwork.kernel.org/project/linux-acpi/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
+W:      https://01.org/linux-acpi
+Q:      https://patchwork.kernel.org/project/linux-acpi/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 S:      Supported
 F:      drivers/acpi/
 F:      drivers/pnp/pnpacpi/
@@ -253,24 +253,38 @@ F:	drivers/pci/*acpi*
 F:      drivers/pci/*/*acpi*
 F:      drivers/pci/*/*/*acpi*
 
+ACPI COMPONENT ARCHITECTURE (ACPICA)
+M:      Robert Moore <robert.moore@intel.com>
+M:      Lv Zheng <lv.zheng@intel.com>
+M:      Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+L:      linux-acpi@vger.kernel.org
+L:      devel@acpica.org
+W:      https://acpica.org/
+W:      https://github.com/acpica/acpica/
+Q:      https://patchwork.kernel.org/project/linux-acpi/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+S:      Supported
+F:      drivers/acpi/acpica/
+F:      include/acpi/
+
 ACPI FAN DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/acpi/fan.c
 
 ACPI THERMAL DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/acpi/*thermal*
 
 ACPI VIDEO DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/acpi/video.c
 
@@ -763,6 +777,10 @@ W:	http://maxim.org.za/at91_26.html
 W:      http://www.linux4sam.org
 S:      Supported
 F:      arch/arm/mach-at91/
+F:      arch/arm/boot/dts/at91*.dts
+F:      arch/arm/boot/dts/at91*.dtsi
+F:      arch/arm/boot/dts/sama*.dts
+F:      arch/arm/boot/dts/sama*.dtsi
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:      Rob Herring <rob.herring@calxeda.com>
@@ -824,15 +842,21 @@ S:	Maintained
 F:      arch/arm/mach-gemini/
 
 ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
-M:      Barry Song <baohua.song@csr.com>
+M:      Barry Song <baohua@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 S:      Maintained
 F:      arch/arm/mach-prima2/
+F:      drivers/clk/clk-prima2.c
+F:      drivers/clocksource/timer-prima2.c
+F:      drivers/clocksource/timer-marco.c
 F:      drivers/dma/sirf-dma.c
 F:      drivers/i2c/busses/i2c-sirf.c
+F:      drivers/input/misc/sirfsoc-onkey.c
+F:      drivers/irqchip/irq-sirfsoc.c
 F:      drivers/mmc/host/sdhci-sirf.c
 F:      drivers/pinctrl/sirf/
+F:      drivers/rtc/rtc-sirfsoc.c
 F:      drivers/spi/spi-sirf.c
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -923,7 +947,7 @@ M:	Javier Martinez Canillas <javier@dowhile0.org>
 L:      linux-omap@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-F:      arch/arm/mach-omap2/board-igep0020.c
+F:      arch/arm/boot/dts/omap3-igep*
 
 ARM/INCOME PXA270 SUPPORT
 M:      Marek Vasut <marek.vasut@gmail.com>
@@ -1003,6 +1027,7 @@ ARM/Marvell Armada 370 and Armada XP SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
 M:      Gregory Clement <gregory.clement@free-electrons.com>
+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/
@@ -1010,6 +1035,7 @@ F:	arch/arm/mach-mvebu/
 ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
+M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-dove/
@@ -1044,7 +1070,6 @@ S:	Maintained
 ARM/NOMADIK ARCHITECTURE
 M:      Alessandro Rubini <rubini@unipv.it>
 M:      Linus Walleij <linus.walleij@linaro.org>
-M:      STEricsson <STEricsson_nomadik_linux@list.st.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-nomadik/
@@ -1142,10 +1167,12 @@ F:	drivers/net/ethernet/i825xx/ether1*
 F:      drivers/net/ethernet/seeq/ether3*
 F:      drivers/scsi/arm/
 
-ARM/SHARK MACHINE SUPPORT
-M:      Alexander Schulz <alex@shark-linux.de>
-W:      http://www.shark-linux.de/shark.html
+ARM/Rockchip SoC support
+M:      Heiko Stuebner <heiko@sntech.de>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
+F:      arch/arm/mach-rockchip/
+F:      drivers/*/*rockchip*
 
 ARM/SAMSUNG ARM ARCHITECTURES
 M:      Ben Dooks <ben-linux@fluff.org>
@@ -1154,6 +1181,8 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:      linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
+F:      arch/arm/boot/dts/s3c*
+F:      arch/arm/boot/dts/exynos*
 F:      arch/arm/plat-samsung/
 F:      arch/arm/mach-s3c24*/
 F:      arch/arm/mach-s3c64xx/
@@ -1396,7 +1425,7 @@ M:	Wolfram Sang <wsa@the-dreams.de>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/misc/eeprom/at24.c
-F:      include/linux/i2c/at24.h
+F:      include/linux/platform_data/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
 M:      "Ed L. Cashin" <ecashin@coraid.com>
@@ -1429,17 +1458,6 @@ T:	git git://github.com/kvalo/ath.git
 S:      Supported
 F:      drivers/net/wireless/ath/ath6kl/
 
-ATHEROS ATH9K WIRELESS DRIVER
-M:      "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
-M:      Jouni Malinen <jouni@qca.qualcomm.com>
-M:      Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
-M:      Senthil Balasubramanian <senthilb@qca.qualcomm.com>
-L:      linux-wireless@vger.kernel.org
-L:      ath9k-devel@lists.ath9k.org
-W:      http://wireless.kernel.org/en/users/Drivers/ath9k
-S:      Supported
-F:      drivers/net/wireless/ath/ath9k/
-
 WILOCITY WIL6210 WIRELESS DRIVER
 M:      Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
 L:      linux-wireless@vger.kernel.org
@@ -1645,16 +1663,15 @@ S:	Maintained
 F:      drivers/net/wireless/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
-M:      Richard Purdie <rpurdie@rpsys.net>
 M:      Jingoo Han <jg1.han@samsung.com>
 S:      Maintained
 F:      drivers/video/backlight/
 F:      include/linux/backlight.h
 
 BATMAN ADVANCED
-M:      Marek Lindner <lindner_marek@yahoo.de>
-M:      Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
-M:      Antonio Quartulli <ordex@autistici.org>
+M:      Marek Lindner <mareklindner@neomailbox.ch>
+M:      Simon Wunderlich <sw@simonwunderlich.de>
+M:      Antonio Quartulli <antonio@meshcoding.com>
 L:      b.a.t.m.a.n@lists.open-mesh.org
 W:      http://www.open-mesh.org/
 S:      Maintained
@@ -1785,6 +1802,7 @@ F:	include/net/bluetooth/
 
 BONDING DRIVER
 M:      Jay Vosburgh <fubar@us.ibm.com>
+M:      Veaceslav Falico <vfalico@redhat.com>
 M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/bonding/
@@ -1806,13 +1824,14 @@ F:	drivers/net/ethernet/broadcom/bnx2.*
 F:      drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:      Eilon Greenstein <eilong@broadcom.com>
+M:      Ariel Elior <ariele@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2x/
 
 BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
-M:      Christian Daudt <csd@broadcom.com>
+M:      Christian Daudt <bcm@fixthebug.org>
+L:      bcm-kernel-feedback-list@broadcom.com
 T:      git git://git.github.com/broadcom/bcm11351
 S:      Maintained
 F:      arch/arm/mach-bcm/
@@ -1850,7 +1869,7 @@ S:	Supported
 F:      drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
-M:      Bhanu Prakash Gollapudi <bprakash@broadcom.com>
+M:      Eddie Wai <eddie.wai@broadcom.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/bnx2fc/
@@ -2293,7 +2312,7 @@ S:	Maintained
 F:      drivers/net/ethernet/ti/cpmac.c
 
 CPU FREQUENCY DRIVERS
-M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Viresh Kumar <viresh.kumar@linaro.org>
 L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
@@ -2324,7 +2343,7 @@ S:      Maintained
 F:      drivers/cpuidle/cpuidle-big_little.c
 
 CPUIDLE DRIVERS
-M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Daniel Lezcano <daniel.lezcano@linaro.org>
 L:      linux-pm@vger.kernel.org
 S:      Maintained
@@ -2355,7 +2374,7 @@ F:	kernel/cpuset.c
 
 CRAMFS FILESYSTEM
 W:      http://sourceforge.net/projects/cramfs/
-S:      Orphan
+S:      Orphan / Obsolete
 F:      Documentation/filesystems/cramfs.txt
 F:      fs/cramfs/
 
@@ -2438,7 +2457,7 @@ S:	Maintained
 F:      drivers/media/dvb-frontends/cxd2820r*
 
 CXGB3 ETHERNET DRIVER (CXGB3)
-M:      Divy Le Ray <divy@chelsio.com>
+M:      Santosh Raspatur <santosh@chelsio.com>
 L:      netdev@vger.kernel.org
 W:      http://www.chelsio.com
 S:      Supported
@@ -2630,6 +2649,7 @@ M:	dm-devel@redhat.com
 L:      dm-devel@redhat.com
 W:      http://sources.redhat.com/dm
 Q:      http://patchwork.kernel.org/project/dm-devel/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
 T:      quilt http://people.redhat.com/agk/patches/linux/editing/
 S:      Maintained
 F:      Documentation/device-mapper/
@@ -2639,6 +2659,18 @@ F:	include/linux/device-mapper.h
 F:      include/linux/dm-*.h
 F:      include/uapi/linux/dm-*.h
 
+DIGI NEO AND CLASSIC PCI PRODUCTS
+M:      Lidza Louina <lidza.louina@gmail.com>
+L:      driverdev-devel@linuxdriverproject.org
+S:      Maintained
+F:      drivers/staging/dgnc/
+
+DIGI EPCA PCI PRODUCTS
+M:      Lidza Louina <lidza.louina@gmail.com>
+L:      driverdev-devel@linuxdriverproject.org
+S:      Maintained
+F:      drivers/staging/dgap/
+
 DIOLAN U2C-12 I2C DRIVER
 M:      Guenter Roeck <linux@roeck-us.net>
 L:      linux-i2c@vger.kernel.org
@@ -2699,6 +2731,8 @@ T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:      Vinod Koul <vinod.koul@intel.com>
 M:      Dan Williams <dan.j.williams@intel.com>
+L:      dmaengine@vger.kernel.org
+Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:      Supported
 F:      drivers/dma/
 F:      include/linux/dma*
@@ -2802,8 +2836,10 @@ M:	Terje Bergström <tbergstrom@nvidia.com>
 L:      dri-devel@lists.freedesktop.org
 L:      linux-tegra@vger.kernel.org
 T:      git git://anongit.freedesktop.org/tegra/linux.git
-S:      Maintained
+S:      Supported
+F:      drivers/gpu/drm/tegra/
 F:      drivers/gpu/host1x/
+F:      include/linux/host1x.h
 F:      include/uapi/drm/tegra_drm.h
 F:      Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
 
@@ -3016,6 +3052,14 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/amd64_edac*
 
+EDAC-CALXEDA
+M:      Doug Thompson <dougthompson@xmission.com>
+M:      Robert Richter <rric@kernel.org>
+L:      linux-edac@vger.kernel.org
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+F:      drivers/edac/highbank*
+
 EDAC-CAVIUM
 M:      Ralf Baechle <ralf@linux-mips.org>
 M:      David Daney <david.daney@cavium.com>
@@ -3097,6 +3141,13 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/i82975x_edac.c
 
+EDAC-MPC85XX
+M:      Johannes Thumshirn <johannes.thumshirn@men.de>
+L:      linux-edac@vger.kernel.org
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+F:      drivers/edac/mpc85xx_edac.[ch]
+
 EDAC-PASEMI
 M:      Egor Martovetsky <egor@pasemi.com>
 L:      linux-edac@vger.kernel.org
@@ -3534,7 +3585,7 @@ F:	fs/freevxfs/
 
 FREEZER
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@sisk.pl>
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/freezing-of-tasks.txt
@@ -3605,6 +3656,12 @@ L:	linux-scsi@vger.kernel.org
 S:      Odd Fixes (e.g., new signatures)
 F:      drivers/scsi/fdomain.*
 
+GCOV BASED KERNEL PROFILING
+M:      Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+S:      Maintained
+F:      kernel/gcov/
+F:      Documentation/gcov.txt
+
 GDT SCSI DISK ARRAY CONTROLLER DRIVER
 M:      Achim Leubner <achim_leubner@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -3654,6 +3711,14 @@ S:	Maintained
 F:      include/asm-generic/
 F:      include/uapi/asm-generic/
 
+GENERIC PHY FRAMEWORK
+M:      Kishon Vijay Abraham I <kishon@ti.com>
+L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git
+S:      Supported
+F:      drivers/phy/
+F:      include/linux/phy/
+
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
@@ -3870,7 +3935,7 @@ F:	drivers/video/hgafb.c
 
 HIBERNATION (aka Software Suspend, aka swsusp)
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@sisk.pl>
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      arch/x86/power/
@@ -4195,7 +4260,7 @@ S:	Maintained
 F:      drivers/media/rc/iguanair.c
 
 IIO SUBSYSTEM AND DRIVERS
-M:      Jonathan Cameron <jic23@cam.ac.uk>
+M:      Jonathan Cameron <jic23@kernel.org>
 L:      linux-iio@vger.kernel.org
 S:      Maintained
 F:      drivers/iio/
@@ -4320,7 +4385,7 @@ F:	drivers/video/i810/
 INTEL MENLOW THERMAL DRIVER
 M:      Sujith Thomas <sujith.thomas@intel.com>
 L:      platform-driver-x86@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/platform/x86/intel_menlow.c
 
@@ -4332,7 +4397,10 @@ F:	arch/x86/kernel/microcode_intel.c
 
 INTEL I/OAT DMA DRIVER
 M:      Dan Williams <dan.j.williams@intel.com>
-S:      Maintained
+M:      Dave Jiang <dave.jiang@intel.com>
+L:      dmaengine@vger.kernel.org
+Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
+S:      Supported
 F:      drivers/dma/ioat*
 
 INTEL IOMMU (VT-d)
@@ -4391,6 +4459,12 @@ F:	Documentation/networking/ixgbevf.txt
 F:      Documentation/networking/i40e.txt
 F:      drivers/net/ethernet/intel/
 
+INTEL-MID GPIO DRIVER
+M:      David Cohen <david.a.cohen@linux.intel.com>
+L:      linux-gpio@vger.kernel.org
+S:      Maintained
+F:      drivers/gpio/gpio-intel-mid.c
+
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:      Stanislav Yakovlev <stas.yakovlev@gmail.com>
 L:      linux-wireless@vger.kernel.org
@@ -4457,6 +4531,13 @@ L:	linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial/ioc3_serial.c
 
+IOMMU DRIVERS
+M:      Joerg Roedel <joro@8bytes.org>
+L:      iommu@lists.linux-foundation.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
+S:      Maintained
+F:      drivers/iommu/
+
 IP MASQUERADING
 M:      Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
 S:      Maintained
@@ -4722,10 +4803,18 @@ S:	Maintained
 F:      Documentation/hwmon/k8temp
 F:      drivers/hwmon/k8temp.c
 
+KTAP
+M:      Jovi Zhangwei <jovi.zhangwei@gmail.com>
+W:      http://www.ktap.org
+L:      ktap@freelists.org
+S:      Maintained
+F:      drivers/staging/ktap/
+
 KCONFIG
-M:      Michal Marek <mmarek@suse.cz>
+M:      "Yann E. MORIN" <yann.morin.1998@free.fr>
 L:      linux-kbuild@vger.kernel.org
-S:      Odd Fixes
+T:      git://gitorious.org/linux-kconfig/linux-kconfig
+S:      Maintained
 F:      Documentation/kbuild/kconfig-language.txt
 F:      scripts/kconfig/
 
@@ -4788,7 +4877,8 @@ KERNEL VIRTUAL MACHINE (KVM)
 M:      Gleb Natapov <gleb@redhat.com>
 M:      Paolo Bonzini <pbonzini@redhat.com>
 L:      kvm@vger.kernel.org
-W:      http://linux-kvm.org
+W:      http://www.linux-kvm.org
+T:      git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 S:      Supported
 F:      Documentation/*/kvm*.txt
 F:      Documentation/virtual/kvm/
@@ -5128,6 +5218,7 @@ M:	Jean Delvare <khali@linux-fr.org>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      Documentation/hwmon/lm90
+F:      Documentation/devicetree/bindings/hwmon/lm90.txt
 F:      drivers/hwmon/lm90.c
 
 LM95234 HARDWARE MONITOR DRIVER
@@ -5306,7 +5397,7 @@ S:	Orphan
 F:      drivers/net/wireless/libertas/
 
 MARVELL MV643XX ETHERNET DRIVER
-M:      Lennert Buytenhek <buytenh@wantstofly.org>
+M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/marvell/mv643xx_eth.*
@@ -6062,6 +6153,12 @@ L:	linux-omap@vger.kernel.org
 S:      Maintained
 F:      drivers/gpio/gpio-omap.c
 
+OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
+M:      Mark Jackson <mpfj@newflow.co.uk>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      arch/arm/boot/dts/am335x-nano.dts
+
 OMFS FILESYSTEM
 M:      Bob Copeland <me@bobcopeland.com>
 L:      linux-karma-devel@lists.sourceforge.net
@@ -6338,6 +6435,7 @@ S:	Supported
 F:      Documentation/PCI/
 F:      drivers/pci/
 F:      include/linux/pci*
+F:      arch/x86/pci/
 
 PCI DRIVER FOR NVIDIA TEGRA
 M:      Thierry Reding <thierry.reding@gmail.com>
@@ -6346,6 +6444,12 @@ S:	Supported
 F:      Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 F:      drivers/pci/host/pci-tegra.c
 
+PCI DRIVER FOR SAMSUNG EXYNOS
+M:      Jingoo Han <jg1.han@samsung.com>
+L:      linux-pci@vger.kernel.org
+S:      Maintained
+F:      drivers/pci/host/pci-exynos.c
+
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
 L:      linux-pcmcia@lists.infradead.org
@@ -6595,7 +6699,7 @@ S:	Obsolete
 F:      drivers/net/wireless/prism54/
 
 PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
-M:      Mikael Pettersson <mikpe@it.uu.se>
+M:      Mikael Pettersson <mikpelinux@gmail.com>
 L:      linux-ide@vger.kernel.org
 S:      Maintained
 F:      drivers/ata/sata_promise.*
@@ -6684,8 +6788,7 @@ PWM SUBSYSTEM
 M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-pwm@vger.kernel.org
 S:      Maintained
-W:      http://gitorious.org/linux-pwm
-T:      git git://gitorious.org/linux-pwm/linux-pwm.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git
 F:      Documentation/pwm.txt
 F:      Documentation/devicetree/bindings/pwm/
 F:      include/linux/pwm.h
@@ -6802,6 +6905,14 @@ T:	git git://linuxtv.org/anttip/media_tree.git
 S:      Maintained
 F:      drivers/media/tuners/qt1010*
 
+QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
+M:      QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
+L:      linux-wireless@vger.kernel.org
+L:      ath9k-devel@lists.ath9k.org
+W:      http://wireless.kernel.org/en/users/Drivers/ath9k
+S:      Supported
+F:      drivers/net/wireless/ath/ath9k/
+
 QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:      Kalle Valo <kvalo@qca.qualcomm.com>
 L:      ath10k@lists.infradead.org
@@ -6911,7 +7022,7 @@ M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:      Documentation/RCU/torture.txt
-F:      kernel/rcutorture.c
+F:      kernel/rcu/torture.c
 
 RDC R-321X SoC
 M:      Florian Fainelli <florian@openwrt.org>
@@ -6938,8 +7049,9 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:      Documentation/RCU/
 X:      Documentation/RCU/torture.txt
 F:      include/linux/rcu*
-F:      kernel/rcu*
-X:      kernel/rcutorture.c
+X:      include/linux/srcu.h
+F:      kernel/rcu/
+X:      kernel/rcu/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:      Alessandro Zummo <a.zummo@towertech.it>
@@ -7252,7 +7364,7 @@ S:	Odd Fixes
 F:      drivers/media/usb/tlg2300/
 
 SC1200 WDT DRIVER
-M:      Zwane Mwaikambo <zwane@arm.linux.org.uk>
+M:      Zwane Mwaikambo <zwanem@gmail.com>
 S:      Maintained
 F:      drivers/watchdog/sc1200wdt.c
 
@@ -7264,11 +7376,13 @@ S:	Maintained
 F:      kernel/sched/
 F:      include/linux/sched.h
 F:      include/uapi/linux/sched.h
+F:      kernel/wait.c
+F:      include/linux/wait.h
 
 SCORE ARCHITECTURE
-M:      Chen Liqin <liqin.chen@sunplusct.com>
+M:      Chen Liqin <liqin.linux@gmail.com>
 M:      Lennox Wu <lennox.wu@gmail.com>
-W:      http://www.sunplusct.com
+W:      http://www.sunplus.com
 S:      Supported
 F:      arch/score/
 
@@ -7626,8 +7740,8 @@ M:	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 W:      http://www.rdrop.com/users/paulmck/RCU/
 S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
-F:      include/linux/srcu*
-F:      kernel/srcu*
+F:      include/linux/srcu.h
+F:      kernel/rcu/srcu.c
 
 SMACK SECURITY MODULE
 M:      Casey Schaufler <casey@schaufler-ca.com>
@@ -7798,6 +7912,13 @@ F:	Documentation/sound/alsa/soc/
 F:      sound/soc/
 F:      include/sound/soc*
 
+SOUND - DMAENGINE HELPERS
+M:      Lars-Peter Clausen <lars@metafoo.de>
+S:      Supported
+F:      include/sound/dmaengine_pcm.h
+F:      sound/core/pcm_dmaengine.c
+F:      sound/soc/soc-generic-dmaengine-pcm.c
+
 SPARC + UltraSPARC (sparc/sparc64)
 M:      "David S. Miller" <davem@davemloft.net>
 L:      sparclinux@vger.kernel.org
@@ -7955,7 +8076,7 @@ S:	Maintained
 F:      drivers/staging/media/go7007/
 
 STAGING - INDUSTRIAL IO
-M:      Jonathan Cameron <jic23@cam.ac.uk>
+M:      Jonathan Cameron <jic23@kernel.org>
 L:      linux-iio@vger.kernel.org
 S:      Odd Fixes
 F:      drivers/staging/iio/
@@ -8077,7 +8198,7 @@ F:	drivers/sh/
 SUSPEND TO RAM
 M:      Len Brown <len.brown@intel.com>
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@sisk.pl>
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/
@@ -8270,14 +8391,72 @@ L:	linux-media@vger.kernel.org
 S:      Maintained
 F:      drivers/media/rc/ttusbir.c
 
-TEGRA SUPPORT
+TEGRA ARCHITECTURE SUPPORT
 M:      Stephen Warren <swarren@wwwdotorg.org>
+M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-tegra@vger.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
 S:      Supported
 N:      [^a-z]tegra
 
+TEGRA ASOC DRIVER
+M:      Stephen Warren <swarren@wwwdotorg.org>
+S:      Supported
+F:      sound/soc/tegra/
+
+TEGRA CLOCK DRIVER
+M:      Peter De Schrijver <pdeschrijver@nvidia.com>
+M:      Prashant Gaikwad <pgaikwad@nvidia.com>
+S:      Supported
+F:      drivers/clk/tegra/
+
+TEGRA DMA DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/dma/tegra20-apb-dma.c
+
+TEGRA GPIO DRIVER
+M:      Stephen Warren <swarren@wwwdotorg.org>
+S:      Supported
+F:      drivers/gpio/gpio-tegra.c
+
+TEGRA I2C DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/i2c/busses/i2c-tegra.c
+
+TEGRA IOMMU DRIVERS
+M:      Hiroshi Doyu <hdoyu@nvidia.com>
+S:      Supported
+F:      drivers/iommu/tegra*
+
+TEGRA KBC DRIVER
+M:      Rakesh Iyer <riyer@nvidia.com>
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/input/keyboard/tegra-kbc.c
+
+TEGRA PINCTRL DRIVER
+M:      Stephen Warren <swarren@wwwdotorg.org>
+S:      Supported
+F:      drivers/pinctrl/pinctrl-tegra*
+
+TEGRA PWM DRIVER
+M:      Thierry Reding <thierry.reding@gmail.com>
+S:      Supported
+F:      drivers/pwm/pwm-tegra.c
+
+TEGRA SERIAL DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/tty/serial/serial-tegra.c
+
+TEGRA SPI DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/spi/spi-tegra*
+
 TEHUTI ETHERNET DRIVER
 M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
@@ -8374,12 +8553,11 @@ S:	Maintained
 F:      sound/soc/codecs/twl4030*
 
 TI WILINK WIRELESS DRIVERS
-M:      Luciano Coelho <luca@coelho.fi>
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org/en/users/Drivers/wl12xx
 W:      http://wireless.kernel.org/en/users/Drivers/wl1251
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/ti/
 F:      include/linux/wl12xx.h
 
@@ -8578,14 +8756,6 @@ S:	Maintained
 F:      arch/m68k/*/*_no.*
 F:      arch/m68k/include/asm/*_no.*
 
-UCLINUX FOR RENESAS H8/300 (H8300)
-M:      Yoshinori Sato <ysato@users.sourceforge.jp>
-W:      http://uclinux-h8.sourceforge.jp/
-S:      Supported
-F:      arch/h8300/
-F:      drivers/ide/ide-h8300.c
-F:      drivers/net/ethernet/8390/ne-h8300.c
-
 UDF FILESYSTEM
 M:      Jan Kara <jack@suse.cz>
 S:      Maintained
@@ -8732,9 +8902,8 @@ F:	Documentation/hid/hiddev.txt
 F:      drivers/hid/usbhid/
 
 USB/IP DRIVERS
-M:      Matt Mooney <mfm@muteddisk.com>
 L:      linux-usb@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/staging/usbip/
 
 USB ISP116X DRIVER
@@ -8787,8 +8956,8 @@ USB PEGASUS DRIVER
 M:      Petko Manolov <petkan@nucleusys.com>
 L:      linux-usb@vger.kernel.org
 L:      netdev@vger.kernel.org
-T:      git git://git.code.sf.net/p/pegasus2/git
-W:      http://pegasus2.sourceforge.net/
+T:      git git://github.com/petkan/pegasus.git
+W:      https://github.com/petkan/pegasus
 S:      Maintained
 F:      drivers/net/usb/pegasus.*
 
@@ -8809,66 +8978,19 @@ USB RTL8150 DRIVER
 M:      Petko Manolov <petkan@nucleusys.com>
 L:      linux-usb@vger.kernel.org
 L:      netdev@vger.kernel.org
-T:      git git://git.code.sf.net/p/pegasus2/git
-W:      http://pegasus2.sourceforge.net/
+T:      git git://github.com/petkan/rtl8150.git
+W:      https://github.com/petkan/rtl8150
 S:      Maintained
 F:      drivers/net/usb/rtl8150.c
 
-USB SERIAL BELKIN F5U103 DRIVER
-M:      William Greathouse <wgreathouse@smva.com>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/belkin_sa.*
-
-USB SERIAL CYPRESS M8 DRIVER
-M:      Lonnie Mendez <dignome@gmail.com>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-W:      http://geocities.com/i0xox0i
-W:      http://firstlight.net/cvs
-F:      drivers/usb/serial/cypress_m8.*
-
-USB SERIAL CYBERJACK DRIVER
-M:      Matthias Bruestle and Harald Welte <support@reiner-sct.com>
-W:      http://www.reiner-sct.de/support/treiber_cyberjack.php
-S:      Maintained
-F:      drivers/usb/serial/cyberjack.c
-
-USB SERIAL DIGI ACCELEPORT DRIVER
-M:      Peter Berger <pberger@brimson.com>
-M:      Al Borchers <alborchers@steinerpoint.com>
+USB SERIAL SUBSYSTEM
+M:      Johan Hovold <jhovold@gmail.com>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
-F:      drivers/usb/serial/digi_acceleport.c
-
-USB SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:      linux-usb@vger.kernel.org
-S:      Supported
 F:      Documentation/usb/usb-serial.txt
-F:      drivers/usb/serial/generic.c
-F:      drivers/usb/serial/usb-serial.c
+F:      drivers/usb/serial/
 F:      include/linux/usb/serial.h
 
-USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
-M:      Gary Brubaker <xavyer@ix.netcom.com>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/empeg.c
-
-USB SERIAL KEYSPAN DRIVER
-M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/*keyspan*
-
-USB SERIAL WHITEHEAT DRIVER
-M:      Support Department <support@connecttech.com>
-L:      linux-usb@vger.kernel.org
-W:      http://www.connecttech.com
-S:      Supported
-F:      drivers/usb/serial/whiteheat*
-
 USB SMSC75XX ETHERNET DRIVER
 M:      Steve Glendinning <steve.glendinning@shawell.net>
 L:      netdev@vger.kernel.org
@@ -9374,6 +9496,7 @@ F:	arch/arm64/include/asm/xen/
 
 XEN NETWORK BACKEND DRIVER
 M:      Ian Campbell <ian.campbell@citrix.com>
+M:      Wei Liu <wei.liu2@citrix.com>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:      netdev@vger.kernel.org
 S:      Supported