Merge remote branch 'sha0/chain_gpt'
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 25 Jun 2010 20:48:49 +0000 (13:48 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 25 Jun 2010 20:48:49 +0000 (13:48 -0700)

Trivial merge