aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:54:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-15 19:54:54 -0800
commit382640b3372405c40b7646c68a50ca91358027e4 (patch)
tree714ed8ce3ffacd397ed6061f6593bd863180fc78 /arch/x86
parentd277993f78b8a5376477c487208d82bc4fecab95 (diff)
parent7f51a100bba517196ac4bdf29408d20ee1c771e8 (diff)
downloadmrst-s0i3-test-382640b3372405c40b7646c68a50ca91358027e4.tar.gz
mrst-s0i3-test-382640b3372405c40b7646c68a50ca91358027e4.tar.xz
mrst-s0i3-test-382640b3372405c40b7646c68a50ca91358027e4.zip
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
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions