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)
commit064a32d82c20cdcb0119a8b316eb520608d8c647
treec67d534bd4458b1482c11f11c724fe93beca4f80
parent0327318445d55808991a63137cfb698a90ab6adf
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/memtest
arch/x86/Kconfig
arch/x86/mm/init_64.c