1 files changed, 40 insertions, 41 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 48418c8475f0..ed48d55662c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -159,7 +159,7 @@ S:	Maintained
 F:      drivers/net/ethernet/realtek/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
 W:      http://serial.sourceforge.net
 S:      Maintained
@@ -789,12 +789,6 @@ F:	arch/arm/mach-mx*/
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
 
-ARM/FREESCALE IMX51
-M:      Amit Kucheria <amit.kucheria@canonical.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-mx5/
-
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1784,9 +1778,9 @@ X:	net/wireless/wext*
 
 CHAR and MISC DRIVERS
 M:      Arnd Bergmann <arnd@arndb.de>
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-S:      Maintained
+S:      Supported
 F:      drivers/char/*
 F:      drivers/misc/*
 
@@ -1805,7 +1799,8 @@ F:	Documentation/zh_CN/
 CISCO VIC ETHERNET NIC DRIVER
 M:      Christian Benvenuti <benve@cisco.com>
 M:      Roopa Prabhu <roprabhu@cisco.com>
-M:      David Wang <dwang2@cisco.com>
+M:      Neel Patel <neepatel@cisco.com>
+M:      Nishank Trivedi <nistrive@cisco.com>
 S:      Supported
 F:      drivers/net/ethernet/cisco/enic/
 
@@ -2288,7 +2283,7 @@ F:	drivers/acpi/dock.c
 DOCUMENTATION
 M:      Randy Dunlap <rdunlap@xenotime.net>
 L:      linux-doc@vger.kernel.org
-T:      quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
+T:      quilt http://xenotime.net/kernel-doc-patches/current/
 S:      Maintained
 F:      Documentation/
 
@@ -2321,7 +2316,7 @@ F:	lib/lru_cache.c
 F:      Documentation/blockdev/drbd/
 
 DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 S:      Supported
 F:      Documentation/kobject.txt
@@ -2351,6 +2346,9 @@ F:	include/drm/i915*
 
 DRM DRIVERS FOR EXYNOS
 M:      Inki Dae <inki.dae@samsung.com>
+M:      Joonyoung Shim <jy0922.shim@samsung.com>
+M:      Seung-Woo Kim <sw0312.kim@samsung.com>
+M:      Kyungmin Park <kyungmin.park@samsung.com>
 L:      dri-devel@lists.freedesktop.org
 S:      Supported
 F:      drivers/gpu/drm/exynos
@@ -2403,7 +2401,7 @@ F:	net/bridge/netfilter/ebt*.c
 
 ECRYPT FILE SYSTEM
 M:      Tyler Hicks <tyhicks@canonical.com>
-M:      Dustin Kirkland <kirkland@canonical.com>
+M:      Dustin Kirkland <dustin.kirkland@gazzang.com>
 L:      ecryptfs@vger.kernel.org
 W:      https://launchpad.net/ecryptfs
 S:      Supported
@@ -3322,6 +3320,12 @@ S:	Maintained
 F:      net/ieee802154/
 F:      drivers/ieee802154/
 
+IIO SUBSYSTEM AND DRIVERS
+M:      Jonathan Cameron <jic23@cam.ac.uk>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/iio/
+
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:      Matthieu Castet <castet.matthieu@free.fr>
 M:      Stanislaw Gruszka <stf_xl@wp.pl>
@@ -3990,11 +3994,11 @@ M:	Rusty Russell <rusty@rustcorp.com.au>
 L:      lguest@lists.ozlabs.org
 W:      http://lguest.ozlabs.org/
 S:      Odd Fixes
-F:      Documentation/virtual/lguest/
+F:      arch/x86/include/asm/lguest*.h
 F:      arch/x86/lguest/
 F:      drivers/lguest/
 F:      include/linux/lguest*.h
-F:      arch/x86/include/asm/lguest*.h
+F:      tools/lguest/
 
 LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
@@ -4134,10 +4138,11 @@ L:	linux-ntfs-dev@lists.sourceforge.net
 W:      http://www.linux-ntfs.org/content/view/19/37/
 S:      Maintained
 F:      Documentation/ldm.txt
-F:      fs/partitions/ldm.*
+F:      block/partitions/ldm.*
 
 LogFS
 M:      Joern Engel <joern@logfs.org>
+M:      Prasad Joshi <prasadjoshi.linux@gmail.com>
 L:      logfs@logfs.org
 W:      logfs.org
 S:      Maintained
@@ -4279,13 +4284,6 @@ S:	Orphan
 F:      drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
 
-MAX1668 TEMPERATURE SENSOR DRIVER
-M:      "David George" <david.george@ska.ac.za>
-L:      lm-sensors@lm-sensors.org
-S:      Maintained
-F:      Documentation/hwmon/max1668
-F:      drivers/hwmon/max1668.c
-
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      lm-sensors@lm-sensors.org
@@ -5635,7 +5633,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      fs/partitions/ibm.c
+F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
@@ -6278,15 +6276,15 @@ S:	Maintained
 F:      arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      stable@vger.kernel.org
-S:      Maintained
+S:      Supported
 
 STAGING SUBSYSTEM
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:      devel@driverdev.osuosl.org
-S:      Maintained
+S:      Supported
 F:      drivers/staging/
 
 STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
@@ -6398,11 +6396,6 @@ M:	Omar Ramirez Luna <omar.ramirez@ti.com>
 S:      Odd Fixes
 F:      drivers/staging/tidspbridge/
 
-STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
-L:      linux-media@vger.kernel.org
-S:      Odd Fixes
-F:      drivers/staging/tm6000/
-
 STAGING - USB ENE SM/MS CARD READER DRIVER
 M:      Al Cho <acho@novell.com>
 S:      Odd Fixes
@@ -6671,10 +6664,10 @@ S:	Maintained
 K:      ^Subject:.*(?i)trivial
 
 TTY LAYER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
-S:      Maintained
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F:      drivers/tty/*
+F:      drivers/tty/
 F:      drivers/tty/serial/serial_core.c
 F:      include/linux/serial_core.h
 F:      include/linux/serial.h
@@ -6960,7 +6953,7 @@ S:	Maintained
 F:      drivers/usb/serial/digi_acceleport.c
 
 USB SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 S:      Supported
 F:      Documentation/usb/usb-serial.txt
@@ -6975,9 +6968,8 @@ S:	Maintained
 F:      drivers/usb/serial/empeg.c
 
 USB SERIAL KEYSPAN DRIVER
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
-W:      http://www.kroah.com/linux/
 S:      Maintained
 F:      drivers/usb/serial/*keyspan*
 
@@ -7005,7 +6997,7 @@ F:	Documentation/video4linux/sn9c102.txt
 F:      drivers/media/video/sn9c102/
 
 USB SUBSYSTEM
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
@@ -7092,7 +7084,7 @@ F:	fs/hppfs/
 
 USERSPACE I/O (UIO)
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:      Maintained
 F:      Documentation/DocBook/uio-howto.tmpl
 F:      drivers/uio/
@@ -7367,6 +7359,7 @@ S:	Supported
 F:      Documentation/hwmon/wm83??
 F:      arch/arm/mach-s3c64xx/mach-crag6410*
 F:      drivers/leds/leds-wm83*.c
+F:      drivers/hwmon/wm83??-hwmon.c
 F:      drivers/input/misc/wm831x-on.c
 F:      drivers/input/touchscreen/wm831x-ts.c
 F:      drivers/input/touchscreen/wm97*.c
@@ -7468,6 +7461,12 @@ S:	Supported
 F:      Documentation/filesystems/xfs.txt
 F:      fs/xfs/
 
+XILINX AXI ETHERNET DRIVER
+M:      Ariane Keller <ariane.keller@tik.ee.ethz.ch>
+M:      Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
+S:      Maintained
+F:      drivers/net/ethernet/xilinx/xilinx_axienet*
+
 XILINX SYSTEMACE DRIVER
 M:      Grant Likely <grant.likely@secretlab.ca>
 W:      http://www.secretlab.ca/