From: H. Peter Anvin <hpa@linux.intel.com>
Date: Wed, 20 Oct 2010 20:18:17 +0000 (-0700)
Subject: Merge branch 'x86/vmware' into x86/trampoline
X-Git-Tag: v2.6.37-rc1~152^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4;p=pandora-kernel.git

Merge branch 'x86/vmware' into x86/trampoline
---

e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4
Reading git-diff-tree failed