Merge remote-tracking branch 'moto/kitkat-mr3-rel-falcon' into HEAD

Conflicts:
	drivers/input/misc/ct406.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/host/sdhci.c