update defconfig
Squash 'enhance power efficiency' patches

Series of patches from NVIDIA on some critical blocking
code paths to allow the CPU to relax instead of busy spinning
thus lowering the load_average and lowering power consumption.

Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Signed-off-by: flar2 <asegaert@gmail.com>
wake_timeout: increase delay to ensure panel is shut down properly
wake_timeout: fully disable wake functions if s2w and dt2w are disabled while screen is off
wake_timeout: do not start wake timeout if s2w and dt2w are disabled
Merge branch 'ElementalX-1.00' into ElementalX-1.00-cm

Conflicts:
	arch/arm/configs/elementalx_defconfig