summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pat.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 18:19:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 18:19:20 +0200
commit1aaf2e59135fd67321f47c11c64a54aac27014e9 (patch)
tree633ffa4db3ac6e8d566cba549510561ffd61d8f4 /arch/x86/mm/pat.c
parentMerge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airl... (diff)
parentMerge commit 'v2.6.31-rc8' into x86/txt (diff)
downloadlinux-1aaf2e59135fd67321f47c11c64a54aac27014e9.tar.xz
linux-1aaf2e59135fd67321f47c11c64a54aac27014e9.zip
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
Diffstat (limited to 'arch/x86/mm/pat.c')
0 files changed, 0 insertions, 0 deletions