Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
authorLinus Torvalds <torvalds@evo.osdl.org>
Thu, 1 Sep 2005 17:56:57 +0000 (10:56 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Thu, 1 Sep 2005 17:56:57 +0000 (10:56 -0700)

Trivial merge