S2W/DT2W/L2M/L2W

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c

Change-Id: I11f76922ec14eddcbcad6a9208dda8a00f5ab04a