author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 30 Nov 2009 21:58:23 +0000 (13:58 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 30 Nov 2009 21:58:23 +0000 (13:58 -0800) |
* '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
firewire: ohci: pass correct iso xmit timestamps to core
firewire: ohci: Make cycleMatch ISO transmission work
Trivial merge