tree 31b3a7555ac7c1d9a856adc0436ed9943c9cab36
parent f9b3bcfbc43ac80f2019a5093ad9a1e624e611b1
parent 4d681be3c33dd74efffbe2a8f70634f7128602ec
author Linus Torvalds <torvalds@linux-foundation.org> 1367336481 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1367336481 -0700

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

Pull x86 paravirt update from Ingo Molnar:
 "Various paravirtualization related changes - the biggest one makes
  guest support optional via CONFIG_HYPERVISOR_GUEST"

* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, wakeup, sleep: Use pvops functions for changing GDT entries
  x86, xen, gdt: Remove the pvops variant of store_gdt.
  x86-32, gdt: Store/load GDT for ACPI S3 or hibernation/resume path is not needed
  x86-64, gdt: Store/load GDT for ACPI S3 or hibernate/resume path is not needed.
  x86: Make Linux guest support optional
  x86, Kconfig: Move PARAVIRT_DEBUG into the paravirt menu