Merge branch 'linus' into x86/pat2
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:30:08 +0000 (19:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:30:08 +0000 (19:30 +0200)
Conflicts:
arch/x86/mm/init_64.c


Trivial merge