Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

diff --cc arch/ia64/kernel/entry.S
Simple merge

diff --cc arch/ppc64/Makefile
index a91daa3,d795775..0a23aea
--- 1/arch/ppc64/Makefile
--- 2/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@@ -132,12 -124,8 +125,10 @@@ include3/asm
        $(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
  
  define archhelp
 -  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
 -  echo  '  zImage.initrd- Compressed kernel image with initrd attached,'
 -  echo  '                sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
 -  echo  '                (arch/$(ARCH)/boot/zImage.initrd)'
 +  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'
 +  echo  '  zImage.initrd.vmode - Compressed kernel image with initrd attached,'
 +  echo  '                        sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
 +  echo  '                        (arch/$(ARCH)/boot/zImage.initrd.vmode)'
 +  echo  '  zImage              - zImage for pSeries machines'
 +  echo  '  zImage.initrd       - zImage with initrd for pSeries machines'
  endef
- 
- CLEAN_FILES += include/asm-ppc64/offsets.h

diff --cc arch/ppc64/kernel/misc.S
Simple merge

diff --cc arch/s390/Makefile
Simple merge