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)

Trivial merge