diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 02:48:05 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 02:48:05 -0500 |
| commit | 7f03292ee16e68be96aa88904afc6152f8d37736 (patch) | |
| tree | 5c32738f0348449c2fa9688d52e6ecf4445d76f0 /MAINTAINERS | |
| parent | c5ecc484c528ff50bdbb16fbfbac758ee368b329 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
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 | |||
| 3489 | F: drivers/net/wireless/libertas/ | 3489 | F: drivers/net/wireless/libertas/ |
| 3490 | 3490 | ||
| 3491 | MARVELL MV643XX ETHERNET DRIVER | 3491 | MARVELL MV643XX ETHERNET DRIVER |
| 3492 | M: Lennert Buytenhek <buytenh@marvell.com> | 3492 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
| 3493 | L: netdev@vger.kernel.org | 3493 | L: netdev@vger.kernel.org |
| 3494 | S: Supported | 3494 | S: Maintained |
| 3495 | F: drivers/net/mv643xx_eth.* | 3495 | F: drivers/net/mv643xx_eth.* |
| 3496 | F: include/linux/mv643xx.h | 3496 | F: include/linux/mv643xx.h |
| 3497 | 3497 | ||