Merge remote branch 'genec/rosh_for_hpa'
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 2 Mar 2011 23:06:55 +0000 (15:06 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 2 Mar 2011 23:06:55 +0000 (15:06 -0800)

Trivial merge