Merge remote-tracking branch 'scott/next' into next

<<
This contains a fix for a chroma_defconfig build break that was
introduced by e6500 tablewalk support, and a device tree binding patch
that missed the previous pull request due to some last-minute polishing.
>>

diff --combined arch/powerpc/Kconfig
index d15594e,ad912d5..a5e5d2e
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -86,7 -86,6 +86,7 @@@ config PP
        bool
        default y
        select ARCH_MIGHT_HAVE_PC_PARPORT
 +      select ARCH_MIGHT_HAVE_PC_SERIO
        select BINFMT_ELF
        select OF
        select OF_EARLY_FLATTREE
@@@ -140,7 -139,6 +140,7 @@@
        select OLD_SIGACTION if PPC32
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_IRQ_EXIT_ON_IRQ_STACK
 +      select ARCH_USE_CMPXCHG_LOCKREF if PPC64
  
  config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN
@@@ -149,10 -147,6 +149,10 @@@ config EARLY_PRINT
        bool
        default y
  
 +config PANIC_TIMEOUT
 +      int
 +      default 180
 +
  config COMPAT
        bool
        default y if PPC64
@@@ -532,6 -526,7 +532,7 @@@ config PPC_16K_PAGE
  
  config PPC_64K_PAGES
        bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64
+       depends on !PPC_FSL_BOOK3E
        select PPC_HAS_HASH_64K if PPC_STD_MMU_64
  
  config PPC_256K_PAGES
@@@ -798,7 -793,7 +799,7 @@@ config HAS_RAPIDI
        default n
  
  config RAPIDIO
 -      bool "RapidIO support"
 +      tristate "RapidIO support"
        depends on HAS_RAPIDIO || PCI
        help
          If you say Y here, the kernel will include drivers and
@@@ -806,7 -801,7 +807,7 @@@
  
  config FSL_RIO
        bool "Freescale Embedded SRIO Controller support"
 -      depends on RAPIDIO && HAS_RAPIDIO
 +      depends on RAPIDIO = y && HAS_RAPIDIO
        default "n"
        ---help---
          Include support for RapidIO controller on Freescale embedded
@@@ -1045,6 -1040,11 +1046,6 @@@ config KEYS_COMPA
  
  source "crypto/Kconfig"
  
 -config PPC_CLOCK
 -      bool
 -      default n
 -      select HAVE_CLK
 -
  config PPC_LIB_RHEAP
        bool