Merge tag 'v3.10.31' into backport/v3.10.31-ltsi/snapshot

This is the 3.10.31 stable release

Conflicts:
	Makefile
	arch/arm/configs/bockw_defconfig
	arch/arm/configs/marzen_defconfig