Merge branch 'develop' into develop

diff --cc TargetList.txt
Simple merge

diff --cc common.h
Simple merge

diff --cc common_power.h
index ddbee94,60de48a..889205c
--- 1/common_power.h
--- 2/common_power.h
+++ b/common_power.h
@@@ -241,7 -241,7 +241,7 @@@ static inline int blas_quickdivide(blas
  #define HAVE_PREFETCH
  #endif
  
- #if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8)  || defined(POWER9)
 -#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || ( defined(PPC970) && defined(OS_DARWIN) )
++#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(POWER9) || ( defined(PPC970) && defined(OS_DARWIN) )
  #define DCBT_ARG      0
  #else
  #define DCBT_ARG      8

diff --cc getarch.c
Simple merge

diff --cc kernel/Makefile.L3
Simple merge

diff --cc param.h
Simple merge