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)

Trivial merge