Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Fri, 21 Oct 2005 19:23:07 +0000 (12:23 -0700)]

Trivial merge