]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/gregkh/linux/fix-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 15 Oct 2004 09:10:51 +0000 (02:10 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 15 Oct 2004 09:10:51 +0000 (02:10 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge