original_kernel/arch/x86/power
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
..
Makefile
cpu.c x86, pat/mtrr: Rendezvous all the cpus for MTRR/PAT init 2009-08-21 16:25:55 -07:00
hibernate_32.c
hibernate_64.c
hibernate_asm_32.S
hibernate_asm_64.S