fixup s2w

Signed-off-by: Bryan Smith <zarboz@gmail.com>
Merge branch '4.4.2_GPE' of https://github.com/zarboz/Monarudo_GPU_M7 into 4.4.2_GPE_KHbP

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c