Merge "msm: mdss: add atraces to track switch cmd delays"

author Linux Build Service Account <lnxbuild@localhost>

Mon, 28 Nov 2016 22:56:34 +0000 (14:56 -0800)

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

Mon, 28 Nov 2016 22:56:32 +0000 (14:56 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Mon, 28 Nov 2016 22:56:34 +0000 (14:56 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Mon, 28 Nov 2016 22:56:32 +0000 (14:56 -0800)
diff --cc drivers/video/fbdev/msm/mdss_dsi.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Mon, 28 Nov 2016 22:56:34 +0000 (14:56 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Mon, 28 Nov 2016 22:56:32 +0000 (14:56 -0800)