Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Oct 2005 15:38:52 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Oct 2005 15:38:52 +0000 (08:38 -0700)

Trivial merge