Revert "update mk file and kernel headers"

This reverts commit 03c2d484a6e60aa643097876b4344a93c7656408.

Conflicts:

	msm7x30.mk

Change-Id: Iec9ed816369726f35b1736e536757fabc443ed69
Revert "missing git add..."

This reverts commit 567903d5edbaaf85a1b743ba8fde3a554fec5c51.
Revert "Update Kernel headers for new FB"

This reverts commit 6f00e1f63cf904923fa2c8c656e52a328d37c3b3.
revert the msm_rotator_buf_sync as it's incomplete

Change-Id: If31fe10e52fcece65b14cae44b8bde325b6d3871
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	include/linux/msm_kgsl.h
	include/linux/msm_mdp.h
	include/linux/msm_rotator.h
	include/linux/msm_vidc_dec.h
	include/linux/msm_vidc_enc.h

Change-Id: I3f6673ca53307643f1cecc5cdd821f3cdc08199e
Merge remote-tracking branch 'upstream1/cm-10.1' into cm-10.1