Merge master.kernel.org:~rmk/linux-2.6-arm.git
Linus Torvalds [Sun, 10 Jul 2005 19:57:49 +0000 (12:57 -0700)]

Trivial merge