tree 9578653e58f514a1894f8a16acef6161b74ea31b
parent 353495a5abcee1368a93f71b0e49390f96f24fb4
parent 9993e0fe0f5f29c69e79efcb271ffc9843002985
author Linus Torvalds <torvalds@linux-foundation.org> 1292362432 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292362432 -0800

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: ohci: fix regression with Agere FW643 rev 06, disable MSI
  firewire: ohci: fix regression with VIA VT6315, disable MSI