msm: rotator: changes from 10.1.A.1.434

Change-Id: I006801b2cdf470625ca0aba326b4bdb1bb961a32

Conflicts:
	drivers/char/msm_rotator.c
mmc: changes from 10.1.A.1.434

Change-Id: I70db2ffceedc8d304e1c80c9d6c3ed8cda801bbf

Conflicts:
	drivers/mmc/core/mmc.c
	drivers/mmc/host/msm_sdcc.c
	include/linux/mmc/card.h