Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next...

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/netlogic/xlp/Makefile
index b93ed83,b93ed83,b93ed83,b93ed83,9007ef0,b93ed83,b93ed83,b93ed83,5bd24b6..6b4b972
--- 1/arch/mips/netlogic/xlp/Makefile
--- 2/arch/mips/netlogic/xlp/Makefile
--- 3/arch/mips/netlogic/xlp/Makefile
--- 4/arch/mips/netlogic/xlp/Makefile
--- 5/arch/mips/netlogic/xlp/Makefile
--- 6/arch/mips/netlogic/xlp/Makefile
--- 7/arch/mips/netlogic/xlp/Makefile
--- 8/arch/mips/netlogic/xlp/Makefile
--- 9/arch/mips/netlogic/xlp/Makefile
+++ b/arch/mips/netlogic/xlp/Makefile
@@@@@@@@@@ -1,2 -1,2 -1,2 -1,2 -1,3 -1,2 -1,2 -1,2 -1,3 +1,4 @@@@@@@@@@
         obj-y                          += setup.o platform.o nlm_hal.o
++++ ++++obj-$(CONFIG_OF)               += of.o
         obj-$(CONFIG_SMP)              += wakeup.o
++++++++ obj-$(CONFIG_USB)              += usb-init.o

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

diff --cc arch/mips/pci/ops-bcm63xx.c
Simple merge