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)
commitf23e586f898704626b4db5287a1c70cdfb11af5d
treeeb69f222a5bcc14558a0b6ef9c4d072e4cead77d
parentaa1050f66db73be1f61eea0c2df8169430d32d8e
parentcc70d0fa55e35fabf250f4dccbaed2fa44f56da7
Merge remote branch 'sha0/boot_args' into pathbased