Merge branch 'linus' into x86/memtest
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:19:53 +0000 (11:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:19:53 +0000 (11:19 +0200)
1  2 
arch/x86/Kconfig
arch/x86/mm/init_64.c

Simple merge
Simple merge