From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 21 Mar 2006 17:23:46 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3;p=openwrt%2Fstaging%2Fblogic.git

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
---

ba93c6297b9cfad5a70b5e5ed13c9dbead6601d3