Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:33:52 +0000 (13:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:33:52 +0000 (13:33 -0800)
commita49cd5f6e9035151c1a0ba1e27fe155f0b82f1d6
tree9578653e58f514a1894f8a16acef6161b74ea31b
parent353495a5abcee1368a93f71b0e49390f96f24fb4
parent9993e0fe0f5f29c69e79efcb271ffc9843002985
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: ohci: fix regression with Agere FW643 rev 06, disable MSI
  firewire: ohci: fix regression with VIA VT6315, disable MSI