Linux 3.4.19

Conflicts:
	drivers/mmc/host/sdhci.c