Merge branch 'merge' into next

Merge the binutils and kexec fixes.

diff --cc arch/powerpc/Makefile
index 68cde2f8a12c52d6657675f1ee6fb5355f625d87,ce4c68a4a8236a4feb70c2b4a7291079d519dc98..5687e299d0a5b3b58970804a04af057d3b6f64f4
--- 1/arch/powerpc/Makefile
--- 2/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -155,8 -150,10 +155,10 @@@ endi
  
  CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
  
- KBUILD_CPPFLAGS       += -Iarch/$(ARCH)
+ asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
+ 
+ KBUILD_CPPFLAGS       += -Iarch/$(ARCH) $(asinstr)
 -KBUILD_AFLAGS += -Iarch/$(ARCH)
 +KBUILD_AFLAGS += -Iarch/$(ARCH) $(AFLAGS-y)
  KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
  CPP           = $(CC) -E $(KBUILD_CFLAGS)
  

diff --cc arch/powerpc/include/asm/ppc_asm.h
Simple merge