Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Oct 2005 21:01:57 +0000 (14:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Oct 2005 21:01:57 +0000 (14:01 -0700)

Trivial merge