revert Revert "Merge commit 'refs/changes/38/75738/1' of http://review.cyanogenmod.org/CyanogenMod/android_kernel_motorola_msm8226 into kitkat"

This reverts commit abfb082ad38135f032063616200fb3d1f600f86d, reversing
changes made to 82b558a40e81ef1b7f25a3d6e6aaa79881416cb5.