Merge "msm: mdss: fix pp timeout during transition from LP1 to power on"

author Linux Build Service Account <lnxbuild@localhost>

Sat, 19 Nov 2016 04:31:49 +0000 (20:31 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Sat, 19 Nov 2016 04:31:49 +0000 (20:31 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Sat, 19 Nov 2016 04:31:49 +0000 (20:31 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sat, 19 Nov 2016 04:31:49 +0000 (20:31 -0800)
diff --cc drivers/video/fbdev/msm/mdss_mdp_ctl.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sat, 19 Nov 2016 04:31:49 +0000 (20:31 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sat, 19 Nov 2016 04:31:49 +0000 (20:31 -0800)