tree 92fad114ca3a4158dba563935cedf5ae20ea8966
parent 04919afb85c8f007b7326c4da5eb61c52e91b9c7
parent dd3c9c4b603c664fedc12facf180db0f1794aafe
author Linus Torvalds <torvalds@linux-foundation.org> 1382124311 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1382124311 -0700

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

Pull x86 fixes from Ingo Molnar:
 "Two fixlets:

   - fix a (rare-config) build bug
   - fix a next-gen SGI/UV hw/firmware enumeration bug"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Update UV3 hub revision ID
  x86/microcode: Correct Kconfig dependencies