Revert "hammerhead: Remove conflict with userspace bluedroid implementation"

This reverts commit 47797b8453ed7bbfec8385e2b81b97218981079b.
qcom: watchdog-v2: Update last_pet during the suspend and resume

Currently last_pet time is not getting modified during the device
suspend and resume. Hence update last_pet variable accordingly.

Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Ramesh Gupta Guntha <rggupt@codeaurora.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
msm: thermal: Update to speed up bootup time

Update KTM driver to remove flush_scheduled_work that
would introduce bootup delay. This patch replaces
cancel_delayed_work with cancel_delayed_work_sync
to cancel a delayed work.

Signed-off-by: Shiju Mathew <shijum@codeaurora.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
cpaccess: remove use of set_get_l2_indirect_reg()

cpaccess is the only client of set_get_l2_indirect_reg(), a special-
purpose API for writing an indirect Krait CP15 register and reading
back the new value. For simplicity, this API is being removed and
replaced with bacl-to-back calls to set_l2_indirect_reg() and
get_l2_indirect_reg(), which should perform comparably.

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
staging: android: lowmemorykiller: set TIF_MEMDIE before send kill sig

Set TIF_MEMDIE tsk_thread flag before send kill signal to the
selected thread. This is to fit a usual code sequence and avoid
potential race issue.

Signed-off-by: Weijie Yang <weijie.yang@samsung.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
LCD KCAL: Fix Gamma max value issue

Major thanks to Yorici Vz for his tireless pursuit of perfection on Nexus 5 Color calibration.

Signed-off-by: Paul Reioux <reioux@gmail.com>
[neo: Fix code indentation for CM11]
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
defconfig: Refresh

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>