Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Sat, 10 Sep 2005 17:16:47 +0000 (10:16 -0700)]

Trivial merge