merge rpi changes with packaging

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/s390/kernel/entry.S
index 91644f78687c4d8892f618fd1e5ea653cc59f285,3bc2825173efea39282e98a2f021d771c848821f..a74ca0fc6bf910f6a7c5cef4aeeb57cc478a58bc
--- 1/arch/s390/kernel/entry.S
--- 2/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@@ -257,8 -263,12 +262,10 @@@ sie_exit
        stg     %r14,__SF_EMPTY+16(%r15)        # set exit reason code
        j       sie_exit
  
-       EX_TABLE(.Lrewind_pad,.Lsie_fault)
+       EX_TABLE(.Lrewind_pad6,.Lsie_fault)
+       EX_TABLE(.Lrewind_pad4,.Lsie_fault)
+       EX_TABLE(.Lrewind_pad2,.Lsie_fault)
        EX_TABLE(sie_exit,.Lsie_fault)
 -EXPORT_SYMBOL(sie64a)
 -EXPORT_SYMBOL(sie_exit)
  #endif
  
  /*

diff --cc arch/sparc/lib/Makefile
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc drivers/char/mem.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/net/ethernet/adaptec/starfire.c
Simple merge

diff --cc drivers/net/phy/marvell.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge

diff --cc drivers/video/fbdev/Kconfig
Simple merge

diff --cc drivers/video/fbdev/Makefile
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/fcntl.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc fs/read_write.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc scripts/Kbuild.include
Simple merge

diff --cc scripts/Makefile.dtbinst
index 15c503f6792b7c1195025887aa41b1a2f579fa32,ad8dc1c93d04bc929b551c5a47f67d244116c7e7..344ca1c2412cb47623d9cb9e03b39a2018a35349
--- 1/scripts/Makefile.dtbinst
--- 2/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@@ -33,9 -34,9 +34,9 @@@ dtbinst-dirs  := $(dts-dirs
  quiet_cmd_dtb_install =       INSTALL $<
        cmd_dtb_install =       mkdir -p $(2); cp $< $(2)
  
 -install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
 +install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))
  
- $(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
+ $(dtbinst-files) $(dtboinst-files) $(dtbinst-dirs): | __dtbs_install_prep
  
  $(dtbinst-files): %.dtb: $(obj)/%.dtb
        $(call cmd,dtb_install,$(install-dir))