add sweep2wake

Conflicts:
	arch/arm/mach-msm/acpuclock-8960.c
	drivers/input/touchscreen/Kconfig
	drivers/usb/gadget/android.c