Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:58:23 +0000 (13:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:58:23 +0000 (13:58 -0800)
commitf8a2cee0911fca04dab114ebd961aa564b3e65c3
treec2816db88a4c15f835e00232c013f989156e7cee
parenta5e63931fd36b7c24e383106ac0f4523cf179206
parent31769cef2e973544164aa7d0db2e2024660d5e21
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: pass correct iso xmit timestamps to core
  firewire: ohci: Make cycleMatch ISO transmission work