Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 81336702086f3289843c78b8d50255b381f9bf81..b6cbac5dbfd5ddf972857d85946428751ebe9065 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1985,7 +1985,6 @@ M:        philb@gnu.org
 P:     Tim Waugh
 M:     tim@cyberelk.net
 P:     David Campbell
-M:     campbell@torque.net
 P:     Andrea Arcangeli
 M:     andrea@suse.de
 L:     linux-parport@lists.infradead.org