Merge branches 'x86/urgent' and 'x86/pat' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:31:23 +0000 (06:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 05:31:23 +0000 (06:31 +0100)
Conflicts:
arch/x86/include/asm/pat.h


Trivial merge