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