msm: rotator: Partial update to jb_chocolate

Conflicts:

	include/linux/msm_rotator.h