Merge "msm: mdss: Fix mixer extension offset"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 28 Jul 2016 02:26:46 +0000 (19:26 -0700)

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

Thu, 28 Jul 2016 02:26:46 +0000 (19:26 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 28 Jul 2016 02:26:46 +0000 (19:26 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 28 Jul 2016 02:26:46 +0000 (19:26 -0700)
diff --cc drivers/video/fbdev/msm/mdss_mdp_ctl.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 28 Jul 2016 02:26:46 +0000 (19:26 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 28 Jul 2016 02:26:46 +0000 (19:26 -0700)