]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 19 Mar 2004 08:02:09 +0000 (00:02 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 19 Mar 2004 08:02:09 +0000 (00:02 -0800)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge