Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4bb5689..caa7c3a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -580,12 +580,24 @@ L:        linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/ad9389b*
 
+ANALOG DEVICES INC ADV7511 DRIVER
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/adv7511*
+
 ANALOG DEVICES INC ADV7604 DRIVER
 M:     Hans Verkuil <hans.verkuil@cisco.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/adv7604*
 
+ANALOG DEVICES INC ADV7842 DRIVER
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/adv7842*
+
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
 L:     device-drivers-devel@blackfin.uclinux.org
@@ -639,6 +651,12 @@ S: Maintained
 F:     drivers/net/appletalk/
 F:     net/appletalk/
 
+APTINA CAMERA SENSOR PLL
+M:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/aptina-pll.*
+
 ARASAN COMPACT FLASH PATA CONTROLLER
 M:     Viresh Kumar <viresh.linux@gmail.com>
 L:     linux-ide@vger.kernel.org
@@ -2090,7 +2108,8 @@ F:        drivers/usb/chipidea/
 
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
-M:     Roopa Prabhu <roprabhu@cisco.com>
+M:     Sujith Sankar <ssujith@cisco.com>
+M:     Govindarajulu Varadarajan <govindarajulu90@gmail.com>
 M:     Neel Patel <neepatel@cisco.com>
 M:     Nishank Trivedi <nistrive@cisco.com>
 S:     Supported
@@ -4386,7 +4405,7 @@ F:        drivers/net/wireless/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:     Johannes Berg <johannes.berg@intel.com>
-M:     Wey-Yi Guy <wey-yi.w.guy@intel.com>
+M:     Emmanuel Grumbach <emmanuel.grumbach@intel.com>
 M:     Intel Linux Wireless <ilw@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://intellinuxwireless.org
@@ -5518,7 +5537,7 @@ L:        platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/x86/msi-wmi.c
 
-MT9M032 SENSOR DRIVER
+MT9M032 APTINA SENSOR DRIVER
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5526,7 +5545,7 @@ S:        Maintained
 F:     drivers/media/i2c/mt9m032.c
 F:     include/media/mt9m032.h
 
-MT9P031 SENSOR DRIVER
+MT9P031 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5534,7 +5553,7 @@ S:        Maintained
 F:     drivers/media/i2c/mt9p031.c
 F:     include/media/mt9p031.h
 
-MT9T001 SENSOR DRIVER
+MT9T001 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5542,7 +5561,7 @@ S:        Maintained
 F:     drivers/media/i2c/mt9t001.c
 F:     include/media/mt9t001.h
 
-MT9V032 SENSOR DRIVER
+MT9V032 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5813,7 +5832,7 @@ M:        Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
 M:     Samuel Ortiz <sameo@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
 L:     linux-nfc@lists.01.org (moderated for non-subscribers)
-S:     Maintained
+S:     Supported
 F:     net/nfc/
 F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
@@ -6942,6 +6961,14 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/memstick/host/r592.*
 
+ROCCAT DRIVERS
+M:     Stefan Achatz <erazor_de@users.sourceforge.net>
+W:     http://sourceforge.net/projects/roccat/
+S:     Maintained
+F:     drivers/hid/hid-roccat*
+F:     include/linux/hid-roccat*
+F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
+
 ROCKETPORT DRIVER
 P:     Comtrol Corp.
 W:     http://www.comtrol.com
@@ -7256,6 +7283,7 @@ W:        http://lksctp.sourceforge.net
 S:     Maintained
 F:     Documentation/networking/sctp.txt
 F:     include/linux/sctp.h
+F:     include/uapi/linux/sctp.h
 F:     include/net/sctp/
 F:     net/sctp/
 
@@ -8004,6 +8032,12 @@ F:       arch/m68k/sun3*/
 F:     arch/m68k/include/asm/sun3*
 F:     drivers/net/ethernet/i825xx/sun3*
 
+SUNDANCE NETWORK DRIVER
+M:     Denis Kirjanov <kda@linux-powerpc.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/dlink/sundance.c
+
 SUPERH
 M:     Paul Mundt <lethal@linux-sh.org>
 L:     linux-sh@vger.kernel.org
@@ -9057,6 +9091,12 @@ F:       drivers/staging/vme/
 F:     drivers/vme/
 F:     include/linux/vme*
 
+VMWARE HYPERVISOR INTERFACE
+M:     Alok Kataria <akataria@vmware.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Supported
+F:     arch/x86/kernel/cpu/vmware.c
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>