Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_kernel_samsung_msm8930-common into cm-11.0
Merge branch 'cm-11.0' of https://github.com/junkyde/vikinger into cm-11.0

da