]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/jgarzik/netconsole-2.5
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 12 Mar 2004 04:51:47 +0000 (20:51 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 12 Mar 2004 04:51:47 +0000 (20:51 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux


Trivial merge