Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Thu, 8 Sep 2005 00:02:24 +0000 (17:02 -0700)]

Trivial merge