Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Oct 2005 01:28:32 +0000 (18:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Oct 2005 01:28:32 +0000 (18:28 -0700)

Trivial merge