Squashed update of kernel from 3.4.72 to 3.4.73

Conflicts:
	drivers/mmc/card/block.c