Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 27 Jun 2005 22:00:10 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 27 Jun 2005 22:00:10 +0000 (15:00 -0700)

Trivial merge