Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2011 21:21:39 +0000 (14:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2011 21:21:39 +0000 (14:21 -0700)
commit8db72a7d7268630e04ec285fbd3e90733b2eddf9
treebb41f5ce688f9595b5734b02c48ef53d2cc067bd
parent8a3d8ed027b563d2875cd3df816fb4a888a8551e
parent2e053a27d9d5ad5e0831e002cbf8043836fb2060
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: Fix for broken configrom updates in quick succession