S2W/DT2W/L2M/L2W

Conflicts:

	drivers/input/touchscreen/synaptics_3200.c
trying to merge flar2's s2w