defconfig: Remove CONFIG_DEBUG_FS
Add missing TSP_BOOSTER flags to make kernel compile without DVFS
LED: Add ability to restrict LEDs according to a time range or disable all together

Conflicts:
	drivers/leds/leds-an30259a.c
SSP: Break out some pieces of ssp.h into a seperate file so I can include only the pieces I need for screen and sensor wake functions
EHCI: Remove some dmesg spam
Remove some clock debug info from dmesg
New fastcharge for qcom S4 adapted from Jean-Pierre and Paul Reioux

Conflicts:
	drivers/battery/max77693_charger.c
FastCharge: Add 500mA step to A/C charging
Add s2w, d2w, w2w and p2w

Conflicts:
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/synaptics_i2c_rmi.c
Fix ups from merges from previous branch
Move all screen on/off stuff from suspend/resume routines and hook it directly to screen on/off from board file
Make s2w and all the others modify irqs while screen is off when ktweaker sets them on boot or if sysfs are written to while screen is off thru adb
Screen wake: Add wake_options_prox_max to let user configure the prox value to block wake functions
wake functions: Add relay to prox file for prox_max, add wake lock monitor work, and some general clean up

Conflicts:
	drivers/input/touchscreen/synaptics_i2c_rmi.c
wake functions: The add synaptics_rmi4_reinit_device for the jizzer since its such a piece of crap and cant handle turning the screen on and off without causing unconfigured
wake funcs: Re-add synaptics_rmi4_reinit_device function but remove duplicate call to the synaptics_rmi4_f51_set_custom_rezero function

Conflicts:
	drivers/input/touchscreen/synaptics_i2c_rmi.c
wake funcs: Remove last remaining synaptics_rmi4_f51_set_custom_rezero for de-jizzification
wake funcs: More jizzer fixes to keep MoronView and still be able to use the screen wake functions
wake funcs: Add missing retval for previous More jizzer fixes commit
sensor wake: Dont remove_sensor when screen goes off just because sensor wake funcs are not on which screwed screen wake from reading prox