diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 08:48:05 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 08:48:05 +0100 |
| commit | 7f03292ee16e68be96aa88904afc6152f8d37736 (patch) | |
| tree | 5c32738f0348449c2fa9688d52e6ecf4445d76f0 /MAINTAINERS | |
| parent | c5ecc484c528ff50bdbb16fbfbac758ee368b329 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
| download | lwn-7f03292ee16e68be96aa88904afc6152f8d37736.tar.gz lwn-7f03292ee16e68be96aa88904afc6152f8d37736.zip | |
Merge branch 'master' into for-2.6.34
Conflicts:
include/linux/blkdev.h
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c95f727236e1..2533fc45a44a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3489,9 +3489,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 |