Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 23 Jul 2005 23:59:55 +0000 (16:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 23 Jul 2005 23:59:55 +0000 (16:59 -0700)

Trivial merge