Merge branch 'akpm' (patches from Andrew)
[sfrench/cifs-2.6.git] / MAINTAINERS
index fe7a27ed0bdb03c3969cc55ae0a85fb18a43fdb0..7f32b510fdea9b69262a31b343942c3a7af82c77 100644 (file)
@@ -7457,6 +7457,13 @@ S:       Maintained
 F:     tools/testing/selftests/
 F:     Documentation/dev-tools/kselftest*
 
+KERNEL USERMODE HELPER
+M:     "Luis R. Rodriguez" <mcgrof@kernel.org>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     kernel/umh.c
+F:     include/linux/umh.h
+
 KERNEL VIRTUAL MACHINE (KVM)
 M:     Paolo Bonzini <pbonzini@redhat.com>
 M:     Radim Krčmář <rkrcmar@redhat.com>
@@ -7632,7 +7639,7 @@ F:        include/linux/kmemleak.h
 F:     mm/kmemleak.c
 F:     mm/kmemleak-test.c
 
-KMOD MODULE USERMODE HELPER
+KMOD KERNEL MODULE LOADER - USERMODE HELPER
 M:     "Luis R. Rodriguez" <mcgrof@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
@@ -7790,6 +7797,13 @@ M:       Sasha Levin <alexander.levin@verizon.com>
 S:     Maintained
 F:     tools/lib/lockdep/
 
+HMM - Heterogeneous Memory Management
+M:     Jérôme Glisse <jglisse@redhat.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/hmm*
+F:     include/linux/hmm*
+
 LIBNVDIMM BLK: MMIO-APERTURE DRIVER
 M:     Ross Zwisler <ross.zwisler@linux.intel.com>
 L:     linux-nvdimm@lists.01.org
@@ -10727,8 +10741,11 @@ W:     http://wiki.enneenne.com/index.php/LinuxPPS_support
 L:     linuxpps@ml.enneenne.com (subscribers-only)
 S:     Maintained
 F:     Documentation/pps/
+F:     Documentation/devicetree/bindings/pps/pps-gpio.txt
+F:     Documentation/ABI/testing/sysfs-pps
 F:     drivers/pps/
 F:     include/linux/pps*.h
+F:     include/uapi/linux/pps.h
 
 PPTP DRIVER
 M:     Dmitry Kozlov <xeb@mail.ru>