tree 633ffa4db3ac6e8d566cba549510561ffd61d8f4
parent 66a4fe0cb80a9fde8cb173289afb863fd279466a
parent 936e894a976dd3b0f07f1f6f43c17b77b7e6146d
author Linus Torvalds <torvalds@linux-foundation.org> 1253031560 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253031560 -0700

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

* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, intel_txt: clean up the impact on generic code, unbreak non-x86
  x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
  x86, intel_txt: Fix typos in Kconfig help
  x86, intel_txt: Factor out the code for S3 setup
  x86, intel_txt: tboot.c needs <asm/fixmap.h>
  intel_txt: Force IOMMU on for Intel TXT launch
  x86, intel_txt: Intel TXT Sx shutdown support
  x86, intel_txt: Intel TXT reboot/halt shutdown support
  x86, intel_txt: Intel TXT boot support