Skip to content
Snippets Groups Projects
Commit 022de3fb authored by Benoit Goby's avatar Benoit Goby
Browse files

Merge branch 'mdss-ulps' into android-msm-dory-3.10

Conflicts:
	drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

Change-Id: I55a2ce61665bab47e733a56f1a79d1913ceca047
parents 309d22bb 0cbd6991
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment