Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Oct 2005 16:59:32 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Oct 2005 16:59:32 +0000 (09:59 -0700)

Trivial merge