From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Sep 2011 23:54:41 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394
X-Git-Tag: v3.1-rc7~26
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=01a7143586f51f80e1b29ebf240c6e5390657450;p=linux.git

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
---

01a7143586f51f80e1b29ebf240c6e5390657450