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

Trivial merge