S2W, DT2W, L2M, L2W, Pocket Detection
perflock, governor adjustments, and more
fix sweep2wake bugs

Conflicts:

	drivers/input/touchscreen/synaptics_3200.c
sweep2wake update

Conflicts:

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