tree 85ede7bda228024062469403ef085f90ac212c6a
parent e61cd5e2e36746e5a4e791b9232aed39bce52ded
parent df91c3513f9a1da5388a5d5972fe4f777fe0d516
author Linus Torvalds <torvalds@linux-foundation.org> 1371832428 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1371832428 -1000

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

Pull x86 fixes from Peter Anvin:
 "This series fixes a couple of build failures, and fixes MTRR cleanup
  and memory setup on very specific memory maps.

  Finally, it fixes triggering backtraces on all CPUs, which was
  inadvertently disabled on x86."

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/efi: Fix dummy variable buffer allocation
  x86: Fix trigger_all_cpu_backtrace() implementation
  x86: Fix section mismatch on load_ucode_ap
  x86: fix build error and kconfig for ia32_emulation and binfmt
  range: Do not add new blank slot with add_range_with_merge
  x86, mtrr: Fix original mtrr range get for mtrr_cleanup