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

arch/mips/Kconfig

arch/mips/kernel/mcount.S

arch/mips/kernel/time.c

arch/mips/loongson/common/Makefile

arch/mips/mm/gup.c

arch/mips/powertv/Kconfig

arch/mips/powertv/asic/asic_devices.c

arch/mips/powertv/init.c

arch/mips/powertv/reset.c

arch/mips/txx9/generic/setup.c