Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

 Conflicts:
	arch/arm64/kernel/Makefile

diff --cc arch/arm64/kernel/Makefile
index 58895f0ba9385f50d7c3d0b44c0be08b90dfd552,12618cbd1bab20330da1ecf5f9cd92252175a2de..b52313653742ba62416b0ef5aedcf2a71aeb430e
--- 1/arch/arm64/kernel/Makefile
--- 2/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -15,10 -15,9 +15,10 @@@ CFLAGS_REMOVE_return_address.o = -p
  arm64-obj-y           := cputable.o debug-monitors.o entry.o irq.o fpsimd.o   \
                           entry-fpsimd.o process.o ptrace.o setup.o signal.o   \
                           sys.o stacktrace.o time.o traps.o io.o vdso.o        \
-                          hyp-stub.o psci.o cpu_ops.o insn.o return_address.o \
 -                         hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o return_address.o
++                         hyp-stub.o psci.o psci-call.o cpu_ops.o insn.o return_address.o \
 +                         opcodes.o
  
 -arm64-obj-$(CONFIG_COMPAT)            += sys32.o kuser32.o signal32.o         \
 +arm64-obj-$(CONFIG_COMPAT)            += sys32.o kuser32.o signal32.o \
                                           sys_compat.o
  arm64-obj-$(CONFIG_FUNCTION_TRACER)   += ftrace.o entry-ftrace.o
  arm64-obj-$(CONFIG_MODULES)           += arm64ksyms.o module.o