]> git.hungrycats.org Git - linux/commitdiff
Merge bk://bk.linux1394.org/ieee1394-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 29 May 2004 06:37:49 +0000 (23:37 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 29 May 2004 06:37:49 +0000 (23:37 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge