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

Trivial merge