Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Mon, 5 Sep 2005 07:14:47 +0000 (00:14 -0700)]

Trivial merge