Merge "deinterface: temporary remove afbc support on chip after g12a [1/1]" into...

author Jianxin Pan <jianxin.pan@amlogic.com>

Mon, 26 Nov 2018 03:25:05 +0000 (19:25 -0800)

committer Gerrit Code Review <gituser@scgit.amlogic.com>

Mon, 26 Nov 2018 03:25:06 +0000 (19:25 -0800)
author Jianxin Pan <jianxin.pan@amlogic.com>
Mon, 26 Nov 2018 03:25:05 +0000 (19:25 -0800)
committer Gerrit Code Review <gituser@scgit.amlogic.com>
Mon, 26 Nov 2018 03:25:06 +0000 (19:25 -0800)
diff --cc drivers/amlogic/media/deinterlace/deinterlace_hw.c
Simple merge
author	Jianxin Pan <jianxin.pan@amlogic.com>
	Mon, 26 Nov 2018 03:25:05 +0000 (19:25 -0800)
committer	Gerrit Code Review <gituser@scgit.amlogic.com>
	Mon, 26 Nov 2018 03:25:06 +0000 (19:25 -0800)