Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 01:13:19 +0000 (18:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 01:13:19 +0000 (18:13 -0700)
commit3210d190dcb717c328d74f8c3f69ec717d665b40
tree4fbdbc85beea494165dc4bc8866f77051a730762
parent6719db6a23d4b7f1e5052eedae394135e3aef9c1
parentaaff12039ffd812d0c8bbff50b87b6f1f09bec3e
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
drivers/firewire/core-device.c