Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Thu, 8 Sep 2005 00:00:53 +0000 (17:00 -0700)]

Trivial merge