Backlight dimmer mod: more gradual transitions
[s2w/dt2w] Make power button also disable irq_wake in touch driver
backlight: Enable Backlight Dimmer

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>
Option to disable touch wake with power button

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel.c
zram: avoid null access when fail to alloc meta

zram_meta_alloc could fail so caller should check it.  Otherwise, your
system will hang.

Signed-off-by: Minchan Kim <minchan@kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Revert "Faux Sound Controls (Squashed)"

This reverts commit 39d9e5081db2f150d2771855477c9c000a734517.
sound_control: initial code push for Headphones gain userspace interface.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/misc/Makefile
sound_control: add headset, speaker and mic gain interfaces. Also add the sysfs control file.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
sound_control: add workaround to prevent audio resets after using custom values. Based on https://github.com/faux123/Nexus_5/commit/33407fd2d63290540eb0054bc7c6611f2080ea8b

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>