From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 4 Mar 2016 23:36:02 +0000 (+0000)
Subject: Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1b3bf847977c2e5974012ddd4b25fef50967d785;p=deliverable%2Flinux.git

Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next
---

1b3bf847977c2e5974012ddd4b25fef50967d785
diff --cc arch/arm/boot/compressed/Makefile
index 7a6a58ef8aaf,4c23a68a0917,43788b1a1ac5,9541277b7952,3f9a9ebc77c3..d50430c40045
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@@@@@ -176,11 -167,11 -176,11 -164,11 -167,9 +173,11 @@@@@@ if [ $(words $(ZRELADDR)) -gt 1 -a "$(C
     	false; \
     fi
     
    -$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
    +efi-obj-$(CONFIG_EFI_STUB) := $(objtree)/drivers/firmware/efi/libstub/lib.a
    +
---  $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
+++ +$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
     		$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) $(ashldi3) \
    -		$(bswapsdi2) FORCE
    +		$(bswapsdi2) $(efi-obj-y) FORCE
     	@$(check_for_multiple_zreladdr)
     	$(call if_changed,ld)
     	@$(check_for_bad_syms)