diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:39:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 09:39:05 -0800 |
| commit | cf10b2853f86e714eac7117484c0d368ce710fa4 (patch) | |
| tree | 6f1574a9de786c8c345ac852eff12d65b2d75bfe /MAINTAINERS | |
| parent | 14591de147f7c9656fa2b9c05680d2b46e286c40 (diff) | |
| parent | 166c3436d683cfe5316c7723ed746a93db053f12 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 76dc820bc88..270e28c0506 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1697,7 +1697,6 @@ S: Maintained MARVELL MV64340 ETHERNET DRIVER P: Manish Lachwani -M: Manish_Lachwani@pmc-sierra.com L: linux-mips@linux-mips.org L: netdev@vger.kernel.org S: Supported |