dt2w/s2w fix again

Conflicts:
	drivers/input/touchscreen/doubletap2wake.c

Conflicts:
	arch/arm/configs/green_machine_defconfig