switch reiserfs to usual conventions for caching ACLs

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 02f6f78..303129a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2482,6 +2482,14 @@ F:       drivers/net/wan/pc300too.c
 F:     drivers/net/wan/pci200syn.c
 F:     drivers/net/wan/wanxl*
 
+GENERIC INCLUDE/ASM HEADER FILES
+P:     Arnd Bergmann
+M:     arnd@arndb.de
+L:     linux-arch@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
+S:     Maintained
+F:     include/asm-generic
+
 GFS2 FILE SYSTEM
 P:     Steven Whitehouse
 M:     swhiteho@redhat.com
@@ -2824,10 +2832,10 @@ S:      Supported
 F:     drivers/scsi/ips.*
 
 IDE SUBSYSTEM
-P:     Bartlomiej Zolnierkiewicz
-M:     bzolnier@gmail.com
+P:     David S. Miller
+M:     davem@davemloft.net
 L:     linux-ide@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
 S:     Maintained
 F:     Documentation/ide/
 F:     drivers/ide/