Revert "Merge branch 'cm-10.1' of https://github.com/razrqcom-dev-team/android_kernel_motorola_msm8960-common into update"

This reverts commit 9174c6da1e49a230922b0515bdcea45f10976c40, reversing
changes made to 8afe46a97f6980001e30093055a59bf69af36b3a.

Conflicts:
	drivers/media/video/msm/msm.c
Merge branch 'jb2' of https://github.com/pcarenza/android_kernel_motorola_msm8960-common into jb2