commit | f8a2cee0911fca04dab114ebd961aa564b3e65c3 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 30 13:58:23 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 30 13:58:23 2009 -0800 |
tree | c2816db88a4c15f835e00232c013f989156e7cee | |
parent | a5e63931fd36b7c24e383106ac0f4523cf179206 [diff] | |
parent | 31769cef2e973544164aa7d0db2e2024660d5e21 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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