S2W/DT2W/L2M/L2W

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c
	include/linux/synaptics_i2c_rmi.h