Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Jan 2006 04:23:21 +0000 (20:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 17 Jan 2006 04:23:21 +0000 (20:23 -0800)
commitcd535057f946f8e803db7d485652904af0a2e5f5
treeebb82a5b818830d2e254cd5c6a0f5e910562a6c4
parentf74e6670c4a788c9a0c52ab2036d8ac6be12f1d8
parent506eecde44d54e838c61c2af38630e8ebb16363e
Merge branch 'for-linus' of /linux/kernel/git/scjody/ieee1394