tree 6031a0713cb1434cd9334dc23665b08d43738313
parent 57935b262c40a3cbe54c5a61be230331a48f0a3a
parent 719038de98bc8479b771c582a1e4a1e86079da22
author Linus Torvalds <torvalds@linux-foundation.org> 1372807464 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1372807464 -0700

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

Pull x86 cpu updates from Ingo Molnar:
 "Two changes:

   - Extend 32-bit double fault debugging aid to 64-bit
   - Fix a build warning"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel/cacheinfo: Shut up last long-standing warning
  x86: Extend #DF debugging aid to 64-bit