]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Dec 2005 23:48:06 +0000 (15:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Dec 2005 23:48:06 +0000 (15:48 -0800)

Trivial merge