| commit | 382640b3372405c40b7646c68a50ca91358027e4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:54:54 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 15 19:54:54 2010 -0800 |
| tree | 714ed8ce3ffacd397ed6061f6593bd863180fc78 | |
| parent | d277993f78b8a5376477c487208d82bc4fecab95 [diff] | |
| parent | 7f51a100bba517196ac4bdf29408d20ee1c771e8 [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: retransmit isochronous transmit packets on cycle loss firewire: net: fix panic in fwnet_write_complete