Merge branch '3.10-fixes' into mips-for-linux-next

arch/mips/Kconfig

arch/mips/ath79/mach-ap136.c

arch/mips/bcm63xx/Kconfig

arch/mips/cavium-octeon/Makefile

arch/mips/cavium-octeon/setup.c

arch/mips/fw/cfe/cfe_api.c

arch/mips/include/asm/fw/cfe/cfe_api.h

arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h

arch/mips/include/asm/mach-cavium-octeon/spaces.h

arch/mips/include/asm/mach-ip27/kernel-entry-init.h

arch/mips/include/asm/mips-boards/generic.h

arch/mips/include/asm/mmu_context.h

arch/mips/include/asm/xtalk/xtalk.h

arch/mips/include/uapi/asm/fcntl.h

arch/mips/include/uapi/asm/inst.h

arch/mips/include/uapi/asm/msgbuf.h

arch/mips/include/uapi/asm/resource.h

arch/mips/include/uapi/asm/siginfo.h

arch/mips/include/uapi/asm/swab.h

arch/mips/kernel/ftrace.c