tree 66982844358516280bd7c55fc6e830a0811da92d
parent 244ff16fb4717708491fa1b3b2a68f9074742d71
parent 3ba5b5ea7dc3a10ef50819b43a9f8de2705f4eec
author Linus Torvalds <torvalds@linux-foundation.org> 1487468096 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1487468096 -0800

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "Make the build clean by working around yet another GCC stupidity"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vm86: Fix unused variable warning if THP is disabled