Merge branch 'x86/platform'
commita4c5e2b18bfb975279b78fe9732c0d7673148028
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 08:35:31 +0000 (21 10:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 08:35:31 +0000 (21 10:35 +0200)
tree39fb0d053488b3d18a80814a9e9602ed400afb7a
parent88b7dccba7a5a6057ad37f5c43fb3906885c6487
parent43605ef188cd39708ddc5e3adc47b337b6ebe40e
Merge branch 'x86/platform'
arch/x86/Kconfig