zip: change output directories based on hostname
arm: mach-msm: fix force fast charge
disable s2w to rule it out
input: atmel: connect_status is long, not boolean
input: synaptics_3k: add back msleep dropped by original s2w commit
Revert "input: synaptics_3k: add back msleep dropped by original s2w commit"

This reverts commit 4c11f8cc72395248e0bae7ed5319669e1a937694.
Revert "input: atmel: connect_status is long, not boolean"

This reverts commit 9feab10c1ad740d83ae18d86dcf100d265804d7a.
Revert "disable s2w to rule it out"

This reverts commit c8632362dfbda370716f433bf04dd557670d0fec.
Revert "drivers: input: atmel: cleanup s2w and simplify sysfs entry implementation for it"

This reverts commit fee5b5bd220ada98821aa6e853ef103ba4433fae.
Revert "drivers: input: synaptics_3k: cleanup s2w and simplify sysfs entry implementation for it"

This reverts commit a49a7f7eeca8121c0d5650aad486afe4d7998a73.
Revert "defconfig: enable sweep2wake"

This reverts commit 5088df6bffd093cb693e109020a26a543ec543d9.

Conflicts:
	arch/arm/configs/ace_defconfig
	arch/arm/configs/ace_perf_defconfig
Revert "input: touchscreen: implement 'sweep2wake' feature"

This reverts commit adec359240f0d5fa72e42e5732e53a3f27269dff.
Merge branch 'cm-10.1-wip' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/Mustaavalkosta/htc7x30-3.0 into rowshow

Conflicts:
	zip