From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 26 Oct 2009 01:48:18 +0000 (+0900)
Subject: Merge branch 'sh/stable-updates'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6253195b671b98a4e5da5d39c2df9f8f257bcea1;p=linux-beck.git

Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/kernel/dwarf.c
---

6253195b671b98a4e5da5d39c2df9f8f257bcea1
diff --cc arch/sh/kernel/dwarf.c
index 4d8c7bd149df,2d07084e4882..6c9d0c10f2be
--- a/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>