synaptics_s7301: add disabling keypad

Change-Id: I5af258d2245024918f08a1a7c93c6efcc4d177b3
smdk4412: cypress-touchkey - add keydisabler

Change-Id: I85efd4c5b2d6a7283c430f5eca2a730ef6b03d18
Merge "smdk4412: cypress-touchkey - add keydisabler" into cm-11.0
Merge "synaptics_s7301: add disabling keypad" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into cm-11.0

Conflicts:
	include/linux/i2c/touchkey_i2c.h

Change-Id: Id8365ab4d751244e9543604db5837984bdf27f29
Merge remote-tracking branch 'kbc/kbc-cyanogen-cm-11.0' into atr-aosp-cm11

Conflicts:
	include/linux/i2c/touchkey_i2c.h