Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/Makefile
index 74316dcc55abe479065dddcfb670ea5cad07d4e8,ab51dc99c03f359d1bdb702b852a2a55b25ac013..2dbecf843d74648888dfb4395ad9a66f485dd03d
--- 1/arch/mips/kernel/Makefile
--- 2/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@@ -32,31 -32,13 +32,14 @@@ obj-$(CONFIG_SYNC_R4K)             += sync-r4k.
  obj-$(CONFIG_STACKTRACE)      += stacktrace.o
  obj-$(CONFIG_MODULES)         += mips_ksyms.o module.o
  
 +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
  obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
  
- obj-$(CONFIG_CPU_LOONGSON2)   += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_MIPS32)      += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_MIPS64)      += r4k_fpu.o r4k_switch.o
+ obj-$(CONFIG_CPU_R4K_FPU)     += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R3000)               += r2300_fpu.o r2300_switch.o
- obj-$(CONFIG_CPU_R4300)               += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R4X00)               += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R5000)               += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R6000)               += r6000_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R5432)               += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R5500)               += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R8000)               += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_RM7000)      += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_RM9000)      += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_NEVADA)      += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_R10000)      += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_SB1)         += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_TX39XX)      += r2300_fpu.o r2300_switch.o
- obj-$(CONFIG_CPU_TX49XX)      += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_VR41XX)      += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_CAVIUM_OCTEON)       += octeon_switch.o
- obj-$(CONFIG_CPU_XLR)         += r4k_fpu.o r4k_switch.o
- obj-$(CONFIG_CPU_XLP)         += r4k_fpu.o r4k_switch.o
  
  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_SMP_UP)          += smp-up.o

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

diff --cc drivers/spi/spi-bcm63xx.c
Simple merge