Merge "drm/sde: bridge chip error and smmu fault handling for recovery"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 26 Jul 2018 00:04:07 +0000 (17:04 -0700)

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

Thu, 26 Jul 2018 00:04:06 +0000 (17:04 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 26 Jul 2018 00:04:07 +0000 (17:04 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 26 Jul 2018 00:04:06 +0000 (17:04 -0700)
diff --cc drivers/gpu/drm/msm/dba_bridge.c
Simple merge
diff --cc drivers/gpu/drm/msm/sde/sde_kms.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 26 Jul 2018 00:04:07 +0000 (17:04 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 26 Jul 2018 00:04:06 +0000 (17:04 -0700)
		1	2
drivers/gpu/drm/msm/dba_bridge.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/msm/sde/sde_kms.c	patch \|	diff1 \|	diff2 \|	blob \| history