summaryrefslogtreecommitdiff
path: root/include/linux/nmi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-04 09:22:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-04 09:22:51 -0700
commit14a6f1989dae9445d4532941bdd6bbad84f4c8da (patch)
treeabaaac620464eb1f1be84b6fd476fc0408a495d5 /include/linux/nmi.h
parentb1be9ead135939136b87d73004891a6bac35bb43 (diff)
parent91e20b5040c67c51aad88cf87db4305c5bd7f79d (diff)
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq update from Thomas Gleixner: "The last update for 4.2 is just moving a macro from a local header to the global one, so it can be used in architecture code as well. Cleanup of the now empty local header is 4.3 material" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
Diffstat (limited to 'include/linux/nmi.h')
0 files changed, 0 insertions, 0 deletions