Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 22:39:15 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Jul 2005 22:39:15 +0000 (15:39 -0700)

Trivial merge