]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 7 Jan 2005 11:17:41 +0000 (03:17 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 7 Jan 2005 11:17:41 +0000 (03:17 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge