Manual merge from github.com:CyanogenMod/android_kernel_samsung_jf into cm-10.2