Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into cm-11.0
Merge remote-tracking branch 'kbc/kbc-cyanogen-cm-11.0' into atr-aosp-cm11