diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-25 21:01:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-25 21:01:56 +0200 |
commit | a4fd8b3accf43d407472e34403d4b0a4df5c0e71 (patch) | |
tree | 6562da0e4b50f623faf0551617063441a7a70d9a /Makefile | |
parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | x86/mshyperv: Remove excess #includes from mshyperv.h (diff) | |
download | linux-a4fd8b3accf43d407472e34403d4b0a4df5c0e71.tar.xz linux-a4fd8b3accf43d407472e34403d4b0a4df5c0e71.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"A single fix to unbreak the vdso32 build for 64bit kernels caused by
excess #includes in the mshyperv header"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mshyperv: Remove excess #includes from mshyperv.h
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions