Merge branch 'linus' into x86/quirks
authorIngo Molnar <mingo@elte.hu>
Mon, 8 Dec 2008 14:07:49 +0000 (15:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 8 Dec 2008 14:07:49 +0000 (15:07 +0100)
1  2 
arch/x86/Kconfig
arch/x86/kernel/es7000_32.c
arch/x86/kernel/setup.c

Simple merge
Simple merge
Simple merge