Merge branch 'sh/stable-updates'
Paul Mundt [Mon, 26 Oct 2009 01:48:18 +0000 (10:48 +0900)]
Conflicts:
arch/sh/kernel/dwarf.c

1  2 
arch/sh/kernel/dwarf.c
arch/sh/kernel/irq.c
arch/sh/kernel/sh_ksyms_32.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>
Simple merge
Simple merge