Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
	drivers/bus/Makefile
	drivers/irqchip/Makefile

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/bus/Kconfig
Simple merge

diff --cc drivers/bus/Makefile
index e023a2bec664d90035c7227725ee777f0cd69fd6,807dd17ef2f822ee98cc2e96916ffe55177f03ad..b4890f6b9896c3e650f336305c0d287d87751207
--- 1/drivers/bus/Makefile
--- 2/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -2,13 -2,11 +2,14 @@@
  # Makefile for the bus drivers.
  #
  
 +# Interconnect bus drivers for ARM platforms
 +obj-$(CONFIG_ARM_CCI)         += arm-cci.o
 +obj-$(CONFIG_ARM_CCN)         += arm-ccn.o
 +
  obj-$(CONFIG_BRCMSTB_GISB_ARB)        += brcmstb_gisb.o
 -obj-$(CONFIG_IMX_WEIM)        += imx-weim.o
 +obj-$(CONFIG_IMX_WEIM)                += imx-weim.o
+ obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
 -obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
 -obj-$(CONFIG_OMAP_OCP2SCP)    += omap-ocp2scp.o
 +obj-$(CONFIG_MVEBU_MBUS)      += mvebu-mbus.o
  
  # Interconnect bus driver for OMAP SoCs.
  obj-$(CONFIG_OMAP_INTERCONNECT)       += omap_l3_smx.o omap_l3_noc.o

diff --cc drivers/clocksource/Kconfig
Simple merge

diff --cc drivers/irqchip/Makefile
index 9176c76eb164a9db636593668f5069a0324792d3,89e45613de766d6e969ff343964f26aaa10e9602..220e76b6412908cceab69b511aae5b80b7797339
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -37,7 -37,7 +37,8 @@@ obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.
  obj-$(CONFIG_XTENSA)                  += irq-xtensa-pic.o
  obj-$(CONFIG_XTENSA_MX)                       += irq-xtensa-mx.o
  obj-$(CONFIG_IRQ_CROSSBAR)            += irq-crossbar.o
 +obj-$(CONFIG_SOC_VF610)                       += irq-vf610-mscm-ir.o
+ obj-$(CONFIG_BCM7038_L1_IRQ)          += irq-bcm7038-l1.o
  obj-$(CONFIG_BCM7120_L2_IRQ)          += irq-bcm7120-l2.o
  obj-$(CONFIG_BRCMSTB_L2_IRQ)          += irq-brcmstb-l2.o
  obj-$(CONFIG_KEYSTONE_IRQ)            += irq-keystone.o