Merge remote-tracking branch 'mfleming/for-hpa/elflink/ldlinux' into elflink
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 28 Jul 2011 21:02:58 +0000 (14:02 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 28 Jul 2011 21:02:58 +0000 (14:02 -0700)

Trivial merge