Linux 3.4.73

Conflicts:
	drivers/md/dm-crypt.c
	drivers/mmc/card/block.c