summaryrefslogtreecommitdiffstats
path: root/drivers/net/netx-eth.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-18 01:54:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-18 01:54:41 +0200
commit01a7143586f51f80e1b29ebf240c6e5390657450 (patch)
tree3c07d62911d6a0901cc3d4795b90132401b2b8bb /drivers/net/netx-eth.c
parentMerge branch '3.1-rc-fixes' of git://linux-iscsi.org/target-pending (diff)
parentfirewire: ohci: add no MSI quirk for O2Micro controller (diff)
downloadlinux-01a7143586f51f80e1b29ebf240c6e5390657450.tar.xz
linux-01a7143586f51f80e1b29ebf240c6e5390657450.zip
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 'drivers/net/netx-eth.c')
0 files changed, 0 insertions, 0 deletions