Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 23:06:50 +0000 (16:06 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 23:06:50 +0000 (16:06 -0700)

Trivial merge