Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>
Mon, 23 May 2005 13:11:45 +0000 (15:11 +0200)
committerThomas Gleixner <tglx@mtd.linutronix.de>
Mon, 23 May 2005 13:11:45 +0000 (15:11 +0200)

Trivial merge