Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into...

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

diff --git a/MAINTAINERS b/MAINTAINERS
index e433e45814af62258b3d0933921535815fb9459a..7d101d5ba953754993c3a4edf0148d0490f5e93e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3882,6 +3882,11 @@ L:       kvm@vger.kernel.org
 S:     Supported
 F:     drivers/uio/uio_pci_generic.c
 
+GET_MAINTAINER SCRIPT
+M:     Joe Perches <joe@perches.com>
+S:     Maintained
+F:     scripts/get_maintainer.pl
+
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <swhiteho@redhat.com>
 L:     cluster-devel@redhat.com
@@ -4006,9 +4011,8 @@ S:        Odd Fixes
 F:     drivers/media/usb/hdpvr/
 
 HWPOISON MEMORY FAILURE HANDLING
-M:     Andi Kleen <andi@firstfloor.org>
+M:     Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 L:     linux-mm@kvack.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 S:     Maintained
 F:     mm/memory-failure.c
 F:     mm/hwpoison-inject.c