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

diff --cc arch/sparc/kernel/ds.c
Simple merge

diff --cc arch/sparc/kernel/unaligned_64.c
index 626e7b06d6b1656ae24bacc851f37637efa3c35b,dae85bc2eda5510b632650d62ad8d3be688669ca..f81d038f7340ce6b80cb65e0e27b2e7f2cb9edd2
--- 1/arch/sparc/kernel/unaligned_64.c
--- 2/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 */