Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 17:23:46 +0000 (09:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 21 Mar 2006 17:23:46 +0000 (09:23 -0800)
commitba93c6297b9cfad5a70b5e5ed13c9dbead6601d3
tree3785afef7c0f7b72ec87f88fc19b88bfb48386fe
parente031d33efde817ce6b4f907f0fa1ff021301748f
parent2b422383c3d8dcd203dd9aea70155be6258dbf6c
Merge git://git./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