Corrected MSMFB_METADATA_GET from MSMFB_METADATA_SET
Added MSMFB_METADATA_SET back
Merge branch 'cm-10.1' of https://github.com/LeJay/android_kernel_samsung_jactiveltexx into cm-10.2

Conflicts:
	include/linux/msm_mdp.h
I can't possibly see this becoming i problem...
Merge branch 'cm-10.1' of https://github.com/LeJay/android_kernel_samsung_jactiveltexx into cm-10.2