Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 8 Aug 2005 19:19:24 +0000 (12:19 -0700)]

Trivial merge