1 files changed, 47 insertions, 14 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a30f7837fcdf..678f07430393 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -253,6 +253,20 @@ 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
@@ -1660,16 +1674,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
@@ -1822,7 +1835,7 @@ 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/
@@ -1867,7 +1880,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/
@@ -2372,7 +2385,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/
 
@@ -2647,6 +2660,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/
@@ -2834,7 +2848,9 @@ L:	dri-devel@lists.freedesktop.org
 L:      linux-tegra@vger.kernel.org
 T:      git git://anongit.freedesktop.org/tegra/linux.git
 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
 
@@ -4791,9 +4807,10 @@ 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/
 
@@ -4856,7 +4873,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/
@@ -5196,6 +5214,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
@@ -5374,7 +5393,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.*
@@ -6412,6 +6431,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>
@@ -6420,6 +6440,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
@@ -6758,8 +6784,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
@@ -6890,6 +6915,14 @@ L:	linux-hexagon@vger.kernel.org
 S:      Supported
 F:      arch/hexagon/
 
+QUALCOMM WCN36XX WIRELESS DRIVER
+M:      Eugene Krasnikov <k.eugene.e@gmail.com>
+L:      wcn36xx@lists.infradead.org
+W:      http://wireless.kernel.org/en/users/Drivers/wcn36xx
+T:      git git://github.com/KrasnikovEugene/wcn36xx.git
+S:      Supported
+F:      drivers/net/wireless/ath/wcn36xx/
+
 QUICKCAM PARALLEL PORT WEBCAMS
 M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org
@@ -7319,7 +7352,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