Merge branch 'cm-10.2' of github.com:CyanogenMod/android_kernel_samsung_jf into kbc-aosp-jb-mr2