Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 18:17:11 +0000 (10:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 10 Nov 2005 18:17:11 +0000 (10:17 -0800)

Trivial merge