Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Sep 2011 23:54:41 +0000 (16:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Sep 2011 23:54:41 +0000 (16:54 -0700)
commit01a7143586f51f80e1b29ebf240c6e5390657450
tree3c07d62911d6a0901cc3d4795b90132401b2b8bb
parent4be0ed42c56c84d980a851f0bdd0fc20b45c3944
parentf39aa30d7741f40ad964341e9243dbbd7f8ff057
Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394

* 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394:
  firewire: ohci: add no MSI quirk for O2Micro controller