From: Linus Torvalds Date: Tue, 16 Feb 2010 03:54:54 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: Ubuntu-5.2.0-15.16~26217 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=382640b3372405c40b7646c68a50ca91358027e4;p=mirror_ubuntu-eoan-kernel.git 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 --- 382640b3372405c40b7646c68a50ca91358027e4