Merge branches 'sh/compressors' and 'sh/stable-updates'

diff --cc arch/sh/Makefile
Simple merge

diff --cc arch/sh/boot/compressed/Makefile
index 59e2937caa2fb5a57f1e9d512d304be57dbbf294,b31618e9e8c89be8c729472aec391d842f40e28b,9531bf1b7c2f878b632f154f5e9a4bd06717758b..6182eca5180ac53390acc88f527c035a228ed027
--- 1/arch/sh/boot/compressed/Makefile
--- 2/arch/sh/boot/compressed/Makefile
--- 3/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@@@ -39,22 -39,18 -38,10 +39,18 @@@@ $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy
   $(obj)/vmlinux.bin: vmlinux FORCE
        $(call if_changed,objcopy)
   
  -$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
  +vmlinux.bin.all-y := $(obj)/vmlinux.bin
  +
  +$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
        $(call if_changed,gzip)
  +$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
  +     $(call if_changed,bzip2)
  +$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
  +     $(call if_changed,lzma)
   
-  suffix-$(CONFIG_KERNEL_GZIP) := gz
-  suffix-$(CONFIG_KERNEL_BZIP2)        := bz2
-  suffix-$(CONFIG_KERNEL_LZMA) := lzma
-  
   OBJCOPYFLAGS += -R .empty_zero_page
   
  -$(obj)/piggy.o: $(obj)/piggy.S $(obj)/vmlinux.bin.gz FORCE
  -     $(call if_changed,as_o_S)
  +LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
  +
  +$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
  +     $(call if_changed,ld)