From: H. Peter Anvin <hpa@linux.intel.com>
Date: Wed, 28 Mar 2012 20:11:36 +0000 (-0700)
Subject: Merge branch x86/build into x86/efi and fix up arch/x86/boot/tools/build.c
X-Git-Tag: v3.5-rc1~128^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9aff3eaaf0966c2a1bb3717d811363d81e52c76;p=pandora-kernel.git

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>
---

a9aff3eaaf0966c2a1bb3717d811363d81e52c76
Reading git-diff-tree failed