Updates

Conflicts:
	drivers/input/touchscreen/synaptics_3200.c