Merge sony release 10.5.A.0.230

Conflicts:
	arch/arm/configs/at91sam9g45_defconfig
	arch/arm/configs/mxs_defconfig
	drivers/mmc/card/block.c
	include/linux/freezer.h
	include/linux/kref.h
	kernel/futex.c
	net/ipv4/ping.c
	net/wireless/reg.c
postmerge: build iris_transport as module