JB_update2

Conflicts:
	Makefile
	arch/arm/configs/t0_04_defconfig
	drivers/input/keyboard/cypress/cypress-touchkey.c