summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/8390/ne2k-pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-31 09:44:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-31 09:44:44 -0800
commita5cb2366fba7b34da285ef627ee44472235d5bee (patch)
tree65cbe29cf4ca1cfd9e7a4bb3f0fa5486498eda53 /drivers/net/ethernet/8390/ne2k-pci.c
parent6ca793abf815d42bcb9022587c0df7691d779a9d (diff)
parent1b0f44923e186b2f9383b3260f6b5fbfc77b9e4a (diff)
Merge tag 'nios2-fixes-v3.19-rc3' of git://git.rocketboards.org/linux-socfpga-next
Pull arch/nios2 fixes from Ley Foon Tan: - fix compilation error when enable CONFIG_PREEMPT - initialize cpuinfo.mmu variable supplied by the device tree * tag 'nios2-fixes-v3.19-rc3' of git://git.rocketboards.org/linux-socfpga-next: nios2: Use preempt_schedule_irq nios2: Initialize cpuinfo.mmu
Diffstat (limited to 'drivers/net/ethernet/8390/ne2k-pci.c')
0 files changed, 0 insertions, 0 deletions