Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Oct 2005 06:12:03 +0000 (23:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Oct 2005 06:12:03 +0000 (23:12 -0700)

Trivial merge