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

diff --cc arch/mips/Kconfig
index 9806a5ae50bef6566fc245d0d6048172464b5309,1f495eb077d8bf40fe2bf6868269aa3f2a9bb22f..b7dc39c6c849189bcc57929cef61f0abd9c4befe
--- 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/c-r4k.c
Simple merge

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

diff --cc arch/mips/oprofile/Makefile
index 8232dbd1228ddaff79d3755e17c9f908df0dcedc,65f5237ec821eee6c61349642b519c01511ae3eb..9c0a6782c091dcc903f3728b21efc2d712c9c67e
--- 1/arch/mips/oprofile/Makefile
--- 2/arch/mips/oprofile/Makefile
+++ b/arch/mips/oprofile/Makefile
@@@ -12,4 -12,6 +12,5 @@@ oprofile-$(CONFIG_CPU_MIPS32)         += op_mo
  oprofile-$(CONFIG_CPU_MIPS64)         += op_model_mipsxx.o
  oprofile-$(CONFIG_CPU_R10000)         += op_model_mipsxx.o
  oprofile-$(CONFIG_CPU_SB1)            += op_model_mipsxx.o
 -oprofile-$(CONFIG_CPU_RM9000)         += op_model_rm9000.o
+ oprofile-$(CONFIG_CPU_XLR)            += op_model_mipsxx.o
  oprofile-$(CONFIG_CPU_LOONGSON2)      += op_model_loongson2.o

diff --cc arch/mips/oprofile/common.c
Simple merge