new s2w

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c

	modified:   drivers/input/touchscreen/synaptics_3200.c
enable S2W fml