aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-23 13:06:49 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-23 13:06:49 -0800
commit5356f664e1d2149b67d2aeed644cc1def128a4ac (patch)
tree8af6289553a71b193082657d508998f828020c95 /MAINTAINERS
parentaaa594cd11c6dff4e3545602be1aadd79969f953 (diff)
parentd172f4ef31bec924c6ebcb242c9d7d290811e1e5 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: Modules: fix memory leak of module names UIO: Add a MAINTAINERS entry for Userspace I/O
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 907094f0714..3d567fd2e0a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4054,6 +4054,14 @@ L: user-mode-linux-user@lists.sourceforge.net
W: http://user-mode-linux.sourceforge.net
S: Maintained
+USERSPACE I/O (UIO)
+P: Hans J. Koch
+M: hjk@linutronix.de
+P: Greg Kroah-Hartman
+M: gregkh@suse.de
+L: linux-kernel@vger.kernel.org
+S: Maintained
+
FAT/VFAT/MSDOS FILESYSTEM:
P: OGAWA Hirofumi
M: hirofumi@mail.parknet.co.jp