]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'moduleh/for-sfr'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:55:54 +0000 (12:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:55:54 +0000 (12:55 +1000)
1  2 
arch/tile/kernel/process.c
arch/tile/kernel/stack.c

Simple merge
index 1ab6377b976a59ba27cb0723222894992c4c791b,0be6b0109ce0cda1e75d858f774f8e9d4d645479..b2f44c28dda6f29c1867c59464462c63ac427e6a
  #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>