]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/davem/bt-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 22 Feb 2004 17:09:57 +0000 (09:09 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 22 Feb 2004 17:09:57 +0000 (09:09 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux


Trivial merge