aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-05 16:02:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-05 16:02:53 -0800
commitef42c58a5b4b8060a3931aab36bf2b4f81b44afc (patch)
treefa87a1a34f5329162008630b814989e0e9391cdd /drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
parentMerge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (diff)
parentMerge tag 'mvebu-irqchip-fixes-3.13' of git://git.infradead.org/linux-mvebu into irq/core (diff)
downloadlinux-dev-ef42c58a5b4b8060a3931aab36bf2b4f81b44afc.tar.xz
linux-dev-ef42c58a5b4b8060a3931aab36bf2b4f81b44afc.zip
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner: "This lot provides: * Bugfixes for armada irq controller * Updates to renesas irq chip * Support for the TI-NSPIRE irq controller Not strictly a bug fix only pull request, but important updates for some of the arm Socs which I completely forgot to send last week. Seems like my obliviousness is getting worse, I just can't remember when it started" * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: Add support for TI-NSPIRE irqchip irqchip: renesas-irqc: Enable mask on suspend irqchip: renesas-irqc: Use lazy disable irqchip: armada-370-xp: fix MSI race condition irqchip: armada-370-xp: fix IPI race condition
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c')
0 files changed, 0 insertions, 0 deletions