Merge branch 'x86/mm' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:39:51 +0000 (10:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:39:51 +0000 (10:39 +0100)
Conflicts:
arch/x86/mm/fault.c


Trivial merge