commit | a4fd8b3accf43d407472e34403d4b0a4df5c0e71 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 25 12:01:56 2017 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 25 12:01:56 2017 -0700 |
tree | 6562da0e4b50f623faf0551617063441a7a70d9a | |
parent | 5f4b37d8784da4217ede8f8bcd301686853dcf8c [diff] | |
parent | 26fcd952d5c977a94ac64bb44ed409e37607b2c9 [diff] |
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