| commit | 50da56706b989b99edb20f9c03172df193240c78 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 26 15:07:46 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 26 15:07:46 2010 -0700 |
| tree | 79c89c416bc2d5369a49320bfbc91a03f3957a44 | |
| parent | e0df9c0b42cc8cb48b801f7a0f54382f6a89ca16 [diff] | |
| parent | fe43d6d9cf59d8f8cbfdcde2018de13ffd1285c7 [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: core: align driver match with modalias firewire: core: fix Model_ID in modalias firewire: ohci: add cycle timer quirk for the TI TSB12LV22 firewire: core: fw_iso_resource_manage: fix error handling