H. Peter Anvin fe47784ba5 Merge branch 'x86/cpu' into x86/xsave ... Conflicts: arch/x86/kernel/cpu/feature_names.c include/asm-x86/cpufeature.h		2008-09-04 09:04:45 -07:00
..
cpu_32.c	Merge branch 'x86/cpu' into x86/xsave	2008-09-04 09:04:45 -07:00
cpu_64.c	x86: xsave: restore xcr0 during resume	2008-08-27 15:23:23 -07:00
hibernate_32.c	x86 PM: update stale comments	2008-02-09 23:24:09 +01:00
hibernate_64.c	x86: remove end_pfn in 64bit	2008-07-08 13:10:38 +02:00
hibernate_asm_32.S	x86: fix i486 suspend to disk CR4 oops	2008-08-18 08:50:19 +02:00
hibernate_asm_64.S	x86 cleanup: suspend_asm_64.S - use X86_CR4_PGE instead of numeric value	2008-02-19 16:18:33 +01:00
Makefile	x86 PM: consolidate suspend and hibernation code	2008-02-09 23:24:09 +01:00