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

Conflicts:
	arch/mips/alchemy/common/platform.c
	arch/mips/alchemy/common/setup.c
	arch/mips/alchemy/devboards/db1200/platform.c
	arch/mips/alchemy/devboards/db1x00/board_setup.c
	arch/mips/alchemy/devboards/db1x00/platform.c
	arch/mips/alchemy/devboards/pb1100/platform.c
	arch/mips/alchemy/devboards/pb1200/platform.c
	arch/mips/alchemy/devboards/pb1500/platform.c
	arch/mips/alchemy/devboards/pb1550/platform.c
	arch/mips/alchemy/devboards/platform.c
	arch/mips/alchemy/devboards/platform.h
	arch/mips/alchemy/xxs1500/platform.c
	arch/mips/cavium-octeon/octeon-irq.c
	arch/mips/configs/db1200_defconfig
	arch/mips/include/asm/mach-au1x00/au1000.h
	drivers/i2c/busses/Kconfig
	drivers/i2c/busses/Makefile
	drivers/pcmcia/au1000_generic.h
	drivers/pcmcia/db1xxx_ss.c
	drivers/pcmcia/xxs1500_ss.c
	drivers/staging/sm7xx/smtc2d.c
	drivers/staging/sm7xx/smtc2d.h

0 files changed, 0 insertions, 0 deletions