Merge branch 'linus' into x86/kconfig
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:28:04 +0000 (11:28 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:28:04 +0000 (11:28 +0200)
1  2 
arch/x86/Kconfig

Simple merge