From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Dec 2014 11:00:53 +0000 (+0000)
Subject: Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro... 
X-Git-Tag: firefly_0821_release~3680^2~44
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3cc3cdd80b944ed697c7aaeef25b7a170177d7f1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

Conflicts:
	arch/arm64/Makefile
---

3cc3cdd80b944ed697c7aaeef25b7a170177d7f1
diff --cc arch/arm64/Makefile
index b1ca918f0f4f,2b27721f5a71..5a4a073745a8
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@@ -20,11 -20,7 +20,12 @@@ LIBGCC 		:= $(shell $(CC) $(KBUILD_CFLA
  KBUILD_DEFCONFIG := defconfig
  
  KBUILD_CFLAGS	+= -mgeneral-regs-only
+ KBUILD_CFLAGS	+= -fno-pic
 +ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)
 +KBUILD_CPPFLAGS	+= -mbig-endian
 +AS		+= -EB
 +LD		+= -EB
 +else
  KBUILD_CPPFLAGS	+= -mlittle-endian
  AS		+= -EL
  LD		+= -EL