Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
commit5ea139503bc7907ca0772c25bbcfb7fbb8ffc16b
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Dec 2007 22:47:11 +0000 (10 14:47 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Dec 2007 22:47:11 +0000 (10 14:47 -0800)
tree136899a7ea541ef40b3d42057bff41cd7f7b4a40
parent437105f2a7f23899fd647e7ada683ba8dacf11ba
parenta186b4a6b22fdc96a1ed63da483d267b5d00839e
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: OHCI 1.0 Isochronous Receive support