Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394
Linus Torvalds [Sat, 17 Sep 2011 23:54:41 +0000 (16:54 -0700)]
* 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394:
  firewire: ohci: add no MSI quirk for O2Micro controller


Trivial merge