Ingo Molnar 801c0be814 Merge branches 'x86/urgent' and 'x86/pat' into x86/core ... Conflicts: arch/x86/include/asm/pat.h		2009-02-26 06:31:23 +01:00
..
asm	Merge branches 'x86/urgent' and 'x86/pat' into x86/core	2009-02-26 06:31:23 +01:00