Commit 6c85661c authored by Iliyan Malchev's avatar Iliyan Malchev
Browse files

Merge commit 'ae8381a3' into android-msm-mako-3.4-wip 



Conflicts:
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/sensors/msm_sensor.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c

Signed-off-by: default avatarIliyan Malchev <malchev@google.com>
parents f4648b6d ae8381a3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment