summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-27 06:51:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-27 06:51:42 -0400
commit162e6df47c4f80c87cb617ec473eca015df454ca (patch)
tree3b0a445994d3fad35ebed41d10316d6d5bdef941 /Makefile
parent5a6bdf06bbd022db25d9935273b409c337c48a6b (diff)
parent83c133cf11fb0e68a51681447e372489f052d40e (diff)
downloadlinux-sh-162e6df47c4f80c87cb617ec473eca015df454ca.tar.gz
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner: "Two bugfixes from Andy addressing at least some of the subtle NMI related wreckage which has been reported by Sasha Levin" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code x86/paravirt: Replace the paravirt nop with a bona fide empty function
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions