]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Dec 2004 07:31:16 +0000 (23:31 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Dec 2004 07:31:16 +0000 (23:31 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge