]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
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)
* '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

1  2 
drivers/firewire/core-device.c

Simple merge