From: Linus Torvalds <torvalds@linux-foundation.org>
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: Ubuntu-5.0.0-8.9~17833
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3210d190dcb717c328d74f8c3f69ec717d665b40;p=mirror_ubuntu-disco-kernel.git

Merge branch 'fixes' of git://git.kernel.org/pub/scm/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