Merge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Fri, 24 Jun 2005 22:33:30 +0000 (15:33 -0700)]

Trivial merge