Merge branch 'x86/vmware' into x86/trampoline
commite44dea35ccb78ab7dc3a75ccec71d7d6f35017c4
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 20 Oct 2010 20:18:17 +0000 (20 13:18 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 20 Oct 2010 20:18:17 +0000 (20 13:18 -0700)
tree2529afef2a74c40beaa3794d07b1b4a8ab374278
parent51ea8a88aae425915b458bfe295f1f10a3d52781
parentb0f4c062fb6dd4c02b1fe6de73319ed50a09b27d
Merge branch 'x86/vmware' into x86/trampoline
Documentation/kernel-parameters.txt
arch/x86/kernel/Makefile