Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...

Freescale updates from Scott:

"Highlights include qbman support (a prerequisite for datapath drivers
such as ethernet), a PCI DMA fix+improvement, reset handler changes, more
8xx optimizations, and some cleanups and fixes."

diff --cc arch/powerpc/include/asm/ppc-opcode.h
Simple merge

diff --cc arch/powerpc/include/asm/reg.h
index a8f63bcb71affb525e4b66186d01f618eff02749,b320c8fb045000553414978d726b74c10b6e64a0..cff79885c2fd4638ee64fb7577aad70ad57a31c0
--- 1/arch/powerpc/include/asm/reg.h
--- 2/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@@ -1249,8 -1249,10 +1249,10 @@@ static inline void mtmsr_isync(unsigne
                                     : "r" ((unsigned long)(v)) \
                                     : "memory")
  #endif
+ #define wrtspr(rn)    asm volatile("mtspr " __stringify(rn) ",0" : \
+                                    : : "memory")
  
 -extern void msr_check_and_set(unsigned long bits);
 +extern unsigned long msr_check_and_set(unsigned long bits);
  extern bool strict_msr_control;
  extern void __msr_check_and_clear(unsigned long bits);
  static inline void msr_check_and_clear(unsigned long bits)

diff --cc arch/powerpc/kernel/traps.c
Simple merge