Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 2 Oct 2005 00:02:13 +0000 (17:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 2 Oct 2005 00:02:13 +0000 (17:02 -0700)

Trivial merge