tree 3785afef7c0f7b72ec87f88fc19b88bfb48386fe
parent e031d33efde817ce6b4f907f0fa1ff021301748f
parent 2b422383c3d8dcd203dd9aea70155be6258dbf6c
author Linus Torvalds <torvalds@g5.osdl.org> 1142961826 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1142961826 -0800

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