Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 42955fe..e384eb7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1984,7 +1984,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