]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.linux1394.org/ieee1394-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 20 Feb 2004 09:16:08 +0000 (01:16 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 20 Feb 2004 09:16:08 +0000 (01:16 -0800)
into ppc970.osdl.org:/home/torvalds/v2.5/linux


Trivial merge