summaryrefslogtreecommitdiff
path: root/init/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-11 09:49:15 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-03-11 09:49:15 (GMT)
commit78b020d035074fc3aa4d017353bb2c32e2aff56f (patch)
treee49922810cfcc880248f588743c619e72f543774 /init/Kconfig
parentbf5172d07ac38e538e01143289e9b46076494ad5 (diff)
parentfee7b0d84cc8c7bc5dc212901c79e93eaf83a5b5 (diff)
parent5490fa96735ce0e2af270c0868987d644b9a38ec (diff)
parent16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff)
downloadlinux-fsl-qoriq-78b020d035074fc3aa4d017353bb2c32e2aff56f.tar.xz
Merge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/core