Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/scjody...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 22 Nov 2005 03:04:44 +0000 (19:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 22 Nov 2005 03:04:44 +0000 (19:04 -0800)
commit989e4d6cbc69191c41ddf4b1c492457410376b43
tree3c36672829527bef6951ca2f1eae7da4285fee31
parent5ea8051a23de7b39bd5efebcaf63c05fd03f0d98
parent963f48a116bf3b797fe184e74c79c50de1da70bb
Merge branch 'for-linus' of git://git./linux/kernel/git/scjody/ieee1394