summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-17 16:54:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-17 16:54:41 -0700
commit01a7143586f51f80e1b29ebf240c6e5390657450 (patch)
tree3c07d62911d6a0901cc3d4795b90132401b2b8bb /net
parent4be0ed42c56c84d980a851f0bdd0fc20b45c3944 (diff)
parentf39aa30d7741f40ad964341e9243dbbd7f8ff057 (diff)
downloadlinux-01a7143586f51f80e1b29ebf240c6e5390657450.tar.bz2
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions