diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-06 11:52:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-06 11:52:01 -0700 |
| commit | 6ea1bc9b1a05891b5ab02ac516abc6dfc00fe22c (patch) | |
| tree | bdca54f356ed8ab6edd5958e95e03e4609ca6b5a /arch/x86/include/asm/nmi.h | |
| parent | fbb77611e95d3d5b2af86a59754a3130877cb667 (diff) | |
| parent | f13343e87713959437a4a50a730de1736f23fc20 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"This fixes two build issues for ralink platforms, both due to missing
#includes which used to be included indirectly via other headers"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ralink: mt7620: Add missing header
MIPS: ralink: Fix build error due to missing header
Diffstat (limited to 'arch/x86/include/asm/nmi.h')
0 files changed, 0 insertions, 0 deletions