diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 11:55:16 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 11:55:16 +0100 |
commit | 8e7deaa4367607057fd7c1038d2f6df981367bd5 (patch) | |
tree | 971e4ca767c3bad790ba13c0dade61181a7d0bb2 /MAINTAINERS | |
parent | 534714781c652a7113b6c90479a781a6b510279e (diff) | |
parent | 75ef7cdda2daa35be9e070ac8e5258759ac03d06 (diff) | |
download | lwn-8e7deaa4367607057fd7c1038d2f6df981367bd5.tar.gz lwn-8e7deaa4367607057fd7c1038d2f6df981367bd5.zip |
Merge branch 'linus' into rt/head
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dc01317d0308..be1b7ca18a13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3498,9 +3498,9 @@ S: Maintained F: drivers/net/wireless/libertas/ MARVELL MV643XX ETHERNET DRIVER -M: Lennert Buytenhek <buytenh@marvell.com> +M: Lennert Buytenhek <buytenh@wantstofly.org> L: netdev@vger.kernel.org -S: Supported +S: Maintained F: drivers/net/mv643xx_eth.* F: include/linux/mv643xx.h |