tree 6562da0e4b50f623faf0551617063441a7a70d9a
parent 5f4b37d8784da4217ede8f8bcd301686853dcf8c
parent 26fcd952d5c977a94ac64bb44ed409e37607b2c9
author Linus Torvalds <torvalds@linux-foundation.org> 1498417316 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1498417316 -0700

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