Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/kernel/dwarf.c

diff --cc arch/sh/kernel/dwarf.c
index 4d8c7bd149df8f855d0fc786fff2dc51dd7048bc,2d07084e4882b2a35404c927e3f02a1392145284..6c9d0c10f2be0bd0fe2c6430a44e8995bb6850ee
--- 1/arch/sh/kernel/dwarf.c
--- 2/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@@ -20,7 -20,7 +20,8 @@@
  #include <linux/list.h>
  #include <linux/mempool.h>
  #include <linux/mm.h>
 +#include <linux/elf.h>
+ #include <linux/ftrace.h>
  #include <asm/dwarf.h>
  #include <asm/unwinder.h>
  #include <asm/sections.h>

diff --cc arch/sh/kernel/irq.c
Simple merge

diff --cc arch/sh/kernel/sh_ksyms_32.c
Simple merge