Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Feb 2017 01:34:56 +0000 (17:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Feb 2017 01:34:56 +0000 (17:34 -0800)
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


Trivial merge