Merge with rsync://fileserver/linux
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>
Sat, 16 Jul 2005 07:20:01 +0000 (09:20 +0200)
committerThomas Gleixner <tglx@mtd.linutronix.de>
Sat, 16 Jul 2005 07:20:01 +0000 (09:20 +0200)

Trivial merge