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

Conflicts:
	arch/arm64/Makefile

diff --cc arch/arm64/Makefile
index b1ca918f0f4f03249a0fd53ee5d599710d754eda,2b27721f5a71abe0674fc550b082e9797757f3f8..5a4a073745a80de17901a89e3e367cac96e6dc29
--- 1/arch/arm64/Makefile
--- 2/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

diff --cc drivers/cpufreq/cpufreq_interactive.c
Simple merge

diff --cc kernel/power/process.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge