Merge branch 'CVE-2014-7970' of git://git.kernel.org/pub/scm/linux/kernel/git/luto...

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cead1126c2b1606ed8bd855038d0e6e2802ad137..ee1bc5bc20ad221d3d2af470ae2b55f2daf76db0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1738,6 +1738,12 @@ M:       Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
 F:     drivers/net/ethernet/cadence/
 
+ATMEL NAND DRIVER
+M:     Josh Wu <josh.wu@atmel.com>
+L:     linux-mtd@lists.infradead.org
+S:     Supported
+F:     drivers/mtd/nand/atmel_nand*
+
 ATMEL SPI DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
@@ -3158,7 +3164,7 @@ F:        include/drm/drm_panel.h
 F:     Documentation/devicetree/bindings/panel/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M:     Daniel Vetter <daniel.vetter@ffwll.ch>
+M:     Daniel Vetter <daniel.vetter@intel.com>
 M:     Jani Nikula <jani.nikula@linux.intel.com>
 L:     intel-gfx@lists.freedesktop.org
 L:     dri-devel@lists.freedesktop.org
@@ -4297,9 +4303,8 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/hd29l2*
 
 HEWLETT-PACKARD SMART2 RAID DRIVER
-M:     Chirag Kantharia <chirag.kantharia@hp.com>
 L:     iss_storagedev@hp.com
-S:     Maintained
+S:     Orphan
 F:     Documentation/blockdev/cpqarray.txt
 F:     drivers/block/cpqarray.*
 
@@ -5300,6 +5305,13 @@ F:       include/linux/lockd/
 F:     include/linux/sunrpc/
 F:     include/uapi/linux/sunrpc/
 
+KERNEL SELFTEST FRAMEWORK
+M:     Shuah Khan <shuahkh@osg.samsung.com>
+L:     linux-api@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/shuah/linux-kselftest
+S:     Maintained
+F:     tools/testing/selftests
+
 KERNEL VIRTUAL MACHINE (KVM)
 M:     Gleb Natapov <gleb@kernel.org>
 M:     Paolo Bonzini <pbonzini@redhat.com>
@@ -5746,11 +5758,8 @@ T:       git git://github.com/linux-test-project/ltp.git
 S:     Maintained
 
 M32R ARCHITECTURE
-M:     Hirokazu Takata <takata@linux-m32r.org>
-L:     linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)
-L:     linux-m32r-ja@ml.linux-m32r.org (in Japanese)
 W:     http://www.linux-m32r.org/
-S:     Maintained
+S:     Orphan
 F:     arch/m32r/
 
 M68K ARCHITECTURE