migrate: fix merge fail

Change-Id: Ic7caec90cd2c7bb977040d4e416016ca36ee4eea
u1: import from CyanogenMod/android_kernel_samsung_smdk4210

Change-Id: I9629a4060538c9c4c6a43a86a56826cd7123d1b5
i777, i9100, n7000: regenerate defconfigs

Change-Id: Ibf954e20e70c9e6dac75b8e1da02bf5a1152098c
u1: add cyanogenmod mdnie scenario

Change-Id: Ieed885c3c06c8c0445d6e6f2bd68de2bc0223491
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into phablet

Conflicts:
	drivers/media/video/samsung/mali/platform/orion-m400/mali_platform_dvfs.c