From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Apr 2012 02:55:54 +0000 (+1000)
Subject: Merge remote-tracking branch 'moduleh/for-sfr'
X-Git-Tag: next-20120402~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15f190ef5cc9b37cd90f544e645be1e3ce8514a8;p=karo-tx-linux.git

Merge remote-tracking branch 'moduleh/for-sfr'
---

15f190ef5cc9b37cd90f544e645be1e3ce8514a8
diff --cc arch/tile/kernel/stack.c
index 1ab6377b976a,0be6b0109ce0..b2f44c28dda6
--- a/arch/tile/kernel/stack.c
+++ b/arch/tile/kernel/stack.c
@@@ -21,11 -21,11 +21,12 @@@
  #include <linux/stacktrace.h>
  #include <linux/uaccess.h>
  #include <linux/mmzone.h>
 +#include <linux/dcache.h>
 +#include <linux/fs.h>
  #include <asm/backtrace.h>
  #include <asm/page.h>
 -#include <asm/tlbflush.h>
  #include <asm/ucontext.h>
+ #include <asm/switch_to.h>
  #include <asm/sigframe.h>
  #include <asm/stack.h>
  #include <arch/abi.h>