H. Peter Anvin b855192c08 Merge branch 'x86/urgent' into x86/pat ... Reason: Change to is_new_memtype_allowed() in x86/urgent Resolved semantic conflicts in: arch/x86/mm/pat.c arch/x86/mm/ioremap.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>		2009-08-26 17:24:28 -07:00
..
cpu.c	x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init	2009-08-21 16:25:55 -07:00
hibernate_32.c	x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set	2008-11-12 23:28:51 +01:00
hibernate_64.c	pm: rework includes, remove arch ifdefs	2009-04-01 08:59:16 -07:00
hibernate_asm_32.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
hibernate_asm_64.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
Makefile	x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR	2009-07-08 13:20:13 +02:00