Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 19 Dec 2005 00:31:56 +0000 (16:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 19 Dec 2005 00:31:56 +0000 (16:31 -0800)
commit23cb3ada1b011f708ff881b66b2cfb6c11068fa5
treec2413fe7180f480b4ecdfd91bdfc0f23ff7df8a5
parent27f4e0834746196f219e3e030ca71ffd3b176483
parent16e842a62a8ffcc2e51def6ef9fd6e0926539bc5
Merge branch 'for-linus' of /linux/kernel/git/scjody/ieee1394