diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:23:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:23:46 -0800 |
commit | ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3 (patch) | |
tree | 3785afef7c0f7b72ec87f88fc19b88bfb48386fe /MAINTAINERS | |
parent | e031d33efde817ce6b4f907f0fa1ff021301748f (diff) | |
parent | 2b422383c3d8dcd203dd9aea70155be6258dbf6c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
README: bzip2 is not new
Documentation/Changes: remove outdated translation references
remove dead Radeon URL
SCSI_AACRAID: add a help text
update the i386 defconfig
MAINTAINERS: remove the LANMEDIA entry
Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8db5c339845..d788e2421c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1524,12 +1524,6 @@ M: davem@davemloft.net L: linux-kernel@vger.kernel.org S: Maintained -LANMEDIA WAN CARD DRIVER -P: Andrew Stanley-Jones -M: asj@lanmedia.com -W: http://www.lanmedia.com/ -S: Supported - LAPB module P: Henner Eisen M: eis@baty.hanse.de |