| commit | a7115d314dda45324baccee6898a561ed253c8e1 | |
| author | Matt Fleming <matt.fleming@intel.com> | |
| Wed, 24 Oct 2012 13:41:00 +0000 (24 14:41 +0100) | ||
| committer | Matt Fleming <matt.fleming@intel.com> | |
| Wed, 24 Oct 2012 13:41:00 +0000 (24 14:41 +0100) | ||
| tree | 02db40f456aa512205e06480611da3569692afef | treesnapshot (tar.gz zip) |
| parent | c5d8c3f1676afb21cc9f780b6161eaaab35730fc | commitdiff |
| parent | 7307d60063ee4303da4de45f9d984fdc8df92146 | commitdiff |
Merge branch 'master' into elflink
The following conflict is a result of the fact comapi_chainboot was
only stubbed out on the 'elflink' branch but was properly marked as
obsolete in 'master'.
Conflicts:
core/comboot.inc
The following conflict is a result of the fact comapi_chainboot was
only stubbed out on the 'elflink' branch but was properly marked as
obsolete in 'master'.
Conflicts:
core/comboot.inc