Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
[linux-2.6.git] / MAINTAINERS
index 3ccbfa96eeecf6181990e89071eb3b8ccdb963e7..995bfd8e6e7f8a830edf5cf04d9376bcf238ab3f 100644 (file)
@@ -2481,10 +2481,10 @@ L:      linux-kernel@vger.kernel.org
 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
-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