Merge remote branch 'sha0/boot_args' into pathbased
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 17 Jun 2010 18:45:14 +0000 (11:45 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 17 Jun 2010 18:45:14 +0000 (11:45 -0700)

Trivial merge