BLN

Conflicts:
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/cypress-touchkey.c

Conflicts:

	drivers/input/keyboard/cypress-touchkey.c