summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-10-20 13:18:17 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-10-20 13:18:17 -0700
commite44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (patch)
tree2529afef2a74c40beaa3794d07b1b4a8ab374278 /kernel
parent51ea8a88aae425915b458bfe295f1f10a3d52781 (diff)
parentb0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff)
Merge branch 'x86/vmware' into x86/trampoline
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions