updates
Backport adsp_video_verify from .38 kernel

Conflicts:

	arch/arm/mach-msm/qdsp5/adsp_video_verify_cmd.c
msm: adsp: qdsp5: updates from caf

Conflicts:

	include/linux/autoconf.h
Backport adsp_video_verify from .38 kernel

Conflicts:

	arch/arm/mach-msm/qdsp5/adsp_video_verify_cmd.c
staging: android: lowmemorykiller: backport from 3.0
fix Ron's error
Revert "fix Ron's error"

This reverts commit 2525aa36106b0b3b8d733a7a9b126ca680cd9b13.
[PATCH]  msm_fb: display: Keep fb1 for MDP version < 4.0.2

For better memory usage, fb1 memory allocation is removed for
targets like 8960 which support BF pipe and true mirroring but
required for targets like 7x30 and 8660 which still needs fb1
for border fill.
Signed-off-by:  Ajay Singh Parmar <aparmar@codeaurora.org>
Revert "[PATCH]  msm_fb: display: Keep fb1 for MDP version < 4.0.2"

This reverts commit 1f4be063fd797613dc78f70ca108a356e978d247

Change-Id: Ieef5f51fd84c5e1917f48df17d670659f26c2b7e
Merge branch 'ics' of git://github.com/PecanCM/lge-kernel-pecan into ics