| commit | a9aff3eaaf0966c2a1bb3717d811363d81e52c76 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Wed Mar 28 13:11:36 2012 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Wed Mar 28 13:11:36 2012 -0700 |
| tree | b442c3d554ff83529deb1783996f6359aebf07ab | |
| parent | e47bb0bda46bf50f81671db502d0c903e0a32604 [diff] | |
| parent | a51f4047758d2bcd099ea113b833ed380f4024ba [diff] |
Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c
Reason for merge:
The updates to the EFI boot stub generation conflicted with the
changes to properly use the get/put_unaligned_le*() macros to
generate images.
This merge commit completes the conversion in
arch/x86/boot/tools/build.c including the places in the code
which had been changed on the x86/efi branch.
Resolved Conflicts:
arch/x86/boot/tools/build.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>