Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial.git
Linus Torvalds [Mon, 29 Aug 2005 17:34:59 +0000 (10:34 -0700)]

Trivial merge