diff options
| author | Linus Torvalds | 2013-07-02 16:29:48 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-07-02 16:29:48 -0700 |
| commit | 52e8ad9066b57510e600acc4bbc4455a81732c6c (patch) | |
| tree | b0f0eda0e51561964c7702f96d39c7ddb7858b1c /drivers | |
| parent | 1982269a5c51c70cddceb8d157f07b522aee0a2d (diff) | |
| parent | cb7b80237a9f41edf2ebd899bc6a443db05578c5 (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar:
"Two changes:
- A Kconfig dependency fix/cleanup
- Introduce the 'make kvmconfig' KVM configuration helper utility
that turns the current .config into a KVM-bootable config. Useful
for debugging specific native kernel configs that have no KVM
config options enabled on VM setups."
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform: Make X86_GOLDFISH depend on X86_EXTENDED_PLATFORM
x86/platform: Add kvmconfig to the phony targets
x86, platform, kvm, kconfig: Turn existing .config's into KVM-capable configs
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions