Merge "lcd: add lcd_ctrl bootargs for lcd driver control [2/2]" into amlogic-4.9-dev

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

Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)

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

Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)
author Jianxin Pan <jianxin.pan@amlogic.com>
Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)
committer Gerrit Code Review <gituser@scgit2.amlogic.com>
Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)
diff --cc drivers/amlogic/media/vout/lcd/lcd_vout.c
Simple merge
diff --cc include/linux/amlogic/media/vout/lcd/lcd_vout.h
Simple merge
author	Jianxin Pan <jianxin.pan@amlogic.com>
	Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)
committer	Gerrit Code Review <gituser@scgit2.amlogic.com>
	Mon, 20 May 2019 02:15:14 +0000 (19:15 -0700)
		1	2
drivers/amlogic/media/vout/lcd/lcd_vout.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/amlogic/media/vout/lcd/lcd_vout.h	patch \|	diff1 \|	diff2 \|	blob \| history