Commit fa51cd05 authored by Iliyan Malchev's avatar Iliyan Malchev
Browse files

Merge remote-tracking branch 'coreaurora.org/msm-3.4' into android-msm-mako-3.4-wip 



Conflicts:
	arch/arm/mach-msm/clock-8960.c
	drivers/media/video/msm/msm.h

Signed-off-by: default avatarIliyan Malchev <malchev@google.com>
parents 23c508a0 2bf044d7
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