Merge "msm: kgsl: Correct the merciu size for a540"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 10 Nov 2016 00:24:54 +0000 (16:24 -0800)

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

Thu, 10 Nov 2016 00:24:53 +0000 (16:24 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 10 Nov 2016 00:24:54 +0000 (16:24 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 10 Nov 2016 00:24:53 +0000 (16:24 -0800)
diff --cc drivers/gpu/msm/adreno_a5xx.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 10 Nov 2016 00:24:54 +0000 (16:24 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 10 Nov 2016 00:24:53 +0000 (16:24 -0800)