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

[linux-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d57c491212b1bf8184272b2c172c18c51c0c09d4..08dd21f6d7b03ee6d8635d780092baae33027df5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2455,10 +2455,10 @@ L:      linux-kernel@vger.kernel.org
 S:     Maintained
 
 TRIVIAL PATCHES
 S:     Maintained
 
 TRIVIAL PATCHES

-P:      Rusty Russell
-M:      trivial@rustcorp.com.au
+P:      Adrian Bunk
+M:      trivial@kernel.org

 L:      linux-kernel@vger.kernel.org
 L:      linux-kernel@vger.kernel.org

-W:      http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
+W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/

 S:      Maintained
 
 TMS380 TOKEN-RING NETWORK DRIVER
 S:      Maintained
 
 TMS380 TOKEN-RING NETWORK DRIVER