You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		16 years ago
..
Makefile	x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR	16 years ago
cpu.c	x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init	16 years ago
hibernate_32.c	x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set	16 years ago
hibernate_64.c	pm: rework includes, remove arch ifdefs	16 years ago
hibernate_asm_32.S	x86: use _types.h headers in asm where available	16 years ago
hibernate_asm_64.S	x86: use _types.h headers in asm where available	16 years ago