Merge branch 'linus' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Feb 2009 13:42:54 +0000 (14:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Feb 2009 13:42:54 +0000 (14:42 +0100)
Conflicts:
arch/x86/mm/fault.c


Trivial merge