touchwake: wake from cypress touchkeys & somehow this extra crap

Conflicts:
	drivers/input/keyboard/cypress/cypress-touchkey.c
	drivers/misc/touch_wake.c