Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@evo.osdl.org>
Fri, 2 Sep 2005 07:52:05 +0000 (00:52 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Fri, 2 Sep 2005 07:52:05 +0000 (00:52 -0700)

Trivial merge