Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Tue, 4 Oct 2005 22:57:53 +0000 (15:57 -0700)]

Trivial merge