From: David S. Miller <davem@davemloft.net>
Date: Fri, 13 Apr 2012 20:32:07 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: next-20120417~72^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3423166fdbc2444bf3a4a27af1d7508364a17be7;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
---

3423166fdbc2444bf3a4a27af1d7508364a17be7
diff --cc arch/sparc/kernel/unaligned_64.c
index 626e7b06d6b1,dae85bc2eda5..f81d038f7340
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
@@@ -22,7 -21,9 +21,8 @@@
  #include <linux/bitops.h>
  #include <linux/perf_event.h>
  #include <linux/ratelimit.h>
 -#include <linux/bitops.h>
  #include <asm/fpumacro.h>
+ #include <asm/cacheflush.h>
  
  enum direction {
  	load,    /* ld, ldd, ldh, ldsh */