Merge branch 'for-hpa/elflink/ldlinux' into elflink
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:51:14 +0000 (09:51 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:51:14 +0000 (09:51 +0100)

Trivial merge