Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 23:18:53 +0000 (15:18 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 23:18:53 +0000 (15:18 -0800)

Trivial merge