Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:45:22 +0000 (10:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:45:22 +0000 (10:45 -0800)

Trivial merge