Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Linus Torvalds [Fri, 9 Sep 2005 22:46:49 +0000 (15:46 -0700)]
1  2 
arch/ia64/kernel/entry.S
arch/ppc64/Makefile
arch/ppc64/kernel/misc.S
arch/s390/Makefile

Simple merge
@@@ -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
Simple merge
Simple merge