tree 2529afef2a74c40beaa3794d07b1b4a8ab374278
parent 51ea8a88aae425915b458bfe295f1f10a3d52781
parent b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d
author H. Peter Anvin <hpa@linux.intel.com> 1287605897 -0700
committer H. Peter Anvin <hpa@linux.intel.com> 1287605897 -0700

Merge branch 'x86/vmware' into x86/trampoline