From: Linus Torvalds Date: Mon, 22 Aug 2011 01:13:19 +0000 (-0700) Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1... X-Git-Tag: firefly_0821_release~3680^2~4607 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3210d190dcb717c328d74f8c3f69ec717d665b40;p=firefly-linux-kernel-4.4.55.git Merge branch 'fixes' of git://git./linux/kernel/git/ieee1394/linux1394-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: core: handle ack_busy when fetching the Config ROM --- 3210d190dcb717c328d74f8c3f69ec717d665b40