Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for...

diff --cc arch/mips/Kconfig
index a94050c1e5a43bc78aac41d7a68384d90f187f82,1f495eb077d8bf40fe2bf6868269aa3f2a9bb22f..07440d7458dbe788beb1748d926a543fafe9f0f7
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -114,8 -113,8 +115,7 @@@ config BCM47X
        select IRQ_CPU
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
-       select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK
 -      select CFE
        help
         Support for BCM47XX based boards
  

diff --cc arch/mips/lantiq/xway/dma.c
Simple merge

diff --cc arch/mips/mm/tlbex.c
Simple merge