fixing sweep2wake

Conflicts:
	arch/arm/mach-msm/acpuclock-8960.c
	drivers/input/keyboard/gpio_keys.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/synaptics_3200.c
	drivers/usb/core/hub.c
	drivers/usb/gadget/android.c