Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:17:25 +0000 (00:17 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:17:25 +0000 (00:17 -0700)

Trivial merge