Merge branch 'x86/urgent' into x86/pat
authorIngo Molnar <mingo@elte.hu>
Fri, 22 Aug 2008 04:06:51 +0000 (06:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 22 Aug 2008 04:06:51 +0000 (06:06 +0200)
Conflicts:
arch/x86/mm/pageattr.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge