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
cm3663: fix initial proximity sensor state

Change-Id: I544cf4065fd18bd9a54c855fdbbe3507c3ec3f75
makefile: mach-exynos: Separate 4x10 and 4x12 objects

Change-Id: If3270ba8e454d224d18202ff5e751fc61792b4d7
mxt224_u1: Silence some status messages

Change-Id: Ied425b0a0c8cd83ba96fdbdfa15a979af59f7cae
mach-u1: Improve touch sensitivity for MXT224E controller

This reduces the janky scrolling observed
Picked from : https://github.com/kgp700/exyroid-sgs2-jb/commit/2476a919c24f07e04f50a80442fc65d27af51ff5

Change-Id: I07c166f6f07b2874fa20be6f41bc5a016d93e653
drivers: modem_if : Remove some debugging

Change-Id: I4ac65badbd41c930bc226d0162cdb446f32d6fe6
Merge "drivers: modem_if : Remove some debugging" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into cm