Changes from Android-msm branch

on driver/video/msm

Change-Id: I24cb2220fcbfa815d29d11d459c96e9dbd6d33db
Signed-off-by: RonGokhale <cips173@gmail.com>

Conflicts:

	include/linux/autoconf.h
Merge "Changes from Android-msm branch" into cm-10.1