tree d64bfae3af141014e93b32036ee8cb3202655ecc
parent 08a8b79600101fd6e13dcf05409b330e7f5b0478
parent 9a3865b185e77d1a4ca2d8356e37c19b78168961
author Linus Torvalds <torvalds@linux-foundation.org> 1306612621 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306612621 -0700

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, asm: Clean up desc.h a bit
  x86, amd: Do not enable ARAT feature on AMD processors below family 0x12
  x86: Move do_page_fault()'s error path under unlikely()
  x86, efi: Retain boot service code until after switching to virtual mode
  x86: Remove unnecessary check in detect_ht()
  x86: Reorder mm_context_t to remove x86_64 alignment padding and thus shrink mm_struct
  x86, UV: Clean up uv_tlb.c
  x86, UV: Add support for SGI UV2 hub chip
  x86, cpufeature: Update CPU feature RDRND to RDRAND