Skip to content
Commit 570365d3 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/irqflags-nmi' into for-next/core 

* for-next/irqflags-nmi:
  arm64: select TRACE_IRQFLAGS_NMI_SUPPORT
  arch: make TRACE_IRQFLAGS_NMI_SUPPORT generic
parents 84d8857a 3381da25
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment