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

Freescale updates from Scott:

"Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."

diff --cc arch/powerpc/Kconfig
index a5e0b47f7f20b35e4109b8da46d05c3753dd2299,fcfe5332416f0527e6aa054c1992645433871466..6a656f8ca26d647b864471f50069839c5e90b63b
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -165,7 -165,7 +165,8 @@@ config PP
        select ARCH_HAS_UBSAN_SANITIZE_ALL
        select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
        select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
 +      select GENERIC_CPU_AUTOPROBE
+       select HAVE_VIRT_CPU_ACCOUNTING
  
  config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN

diff --cc arch/powerpc/Kconfig.debug
Simple merge

diff --cc arch/powerpc/configs/pq2fads_defconfig
Simple merge

diff --cc arch/powerpc/include/asm/exception-64s.h
Simple merge

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

diff --cc arch/powerpc/xmon/xmon.c
Simple merge