Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Sep 2005 17:39:24 +0000 (10:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 16 Sep 2005 17:39:24 +0000 (10:39 -0700)

Trivial merge