Squash of new cm-10.1 changes

Conflicts:
	arch/arm/mach-msm/board-m2-display.c

Change-Id: Ibf68b1217fd9b13df7f5af52e37f22424d4f7c49