Linux 3.4.73

Conflicts:
	drivers/mmc/card/block.c
Add missing MMC_BLK_TIMEOUT_MS