Merge remote-tracking branch 'remotes/quic/partner-android/android-msm-mako-3.4-wip' into mybranch
* remotes/quic/partner-android/android-msm-mako-3.4-wip: (62 commits)
timers: Fix endless looping between cascade() and internal_add_timer()
nohz: Fix idle ticks in cpu summary line of /proc/stat
workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active
mmc: msm_sdcc: fix race conditions in runtime PM
v4l2: fix the memory leak
msm: camera: nullify pointers after kfree and fix the memory leaks
mako: update display settings
prima: release v3.2.1.11h
prima: release v3.2.1.11g
wcnss: Notify Kernel suspend/resume to WCNSS
prima: release v3.2.1.11f
msm: camera: fix the memory leak and null check after kmalloc
Revert "Revert "mako: msm: board: enable HS200 bus speed mode support""
Revert "mako_defconfig: set CONFIG_SLUB_DEBUG_ON=y"
PM: Prevent runtime suspend during system resume
v4l2: add NULL checks fh->vdev
use clamp_t in UNAME26 fix
kernel/sys.c: fix stack memory content leak via UNAME26
prima: null check after kzalloc
prima: release v3.2.1.11e
...
Conflicts:
drivers/video/msm/msm_fb.c
Change-Id: I738ec023cf844fc2ab62af9be8d5b88b6c4b5165
Signed-off-by: Anh Nguyen <anguyen@codeaurora.org>