linux-sg2042/arch/x86/power
H. Peter Anvin 68d00bbebb Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-02-01 02:28:36 -08:00
..
Makefile x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR 2009-07-08 13:20:13 +02:00
cpu.c x86, topology: Debug CPU0 hotplug 2012-11-14 15:28:11 -08:00
hibernate_32.c x86-32, mm: Remove reference to resume_map_numa_kva() 2013-01-31 14:12:30 -08:00
hibernate_64.c x86, 64bit, mm: hibernate use generic mapping_init 2013-01-29 19:32:59 -08:00
hibernate_asm_32.S x86-32, resume: do a global tlb flush in S4 resume 2010-03-30 11:46:02 -07:00
hibernate_asm_64.S x86: use _types.h headers in asm where available 2009-02-13 11:35:01 -08:00