summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 09:01:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 09:01:32 -0800
commit5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch)
tree8290f03bcd6af331d7a401282028acfeea37d1de /MAINTAINERS
parent333c47c847c90aaefde8b593054d9344106333b5 (diff)
parentb7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (diff)
downloadlinux-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.tar.gz
linux-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.tar.bz2
linux-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3ccbfa96eeec..995bfd8e6e7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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