Merge branch 'drm-tda998x-mali' into drm-tda998x-devel

author Russell King <[email protected]>

Tue, 1 Nov 2016 09:17:57 +0000 (09:17 +0000)

committer Russell King <[email protected]>

Tue, 1 Nov 2016 09:17:57 +0000 (09:17 +0000)
author Russell King <[email protected]>
Tue, 1 Nov 2016 09:17:57 +0000 (09:17 +0000)
committer Russell King <[email protected]>
Tue, 1 Nov 2016 09:17:57 +0000 (09:17 +0000)
diff --cc arch/arm/boot/dts/am335x-boneblack.dts
Simple merge
diff --cc drivers/gpu/drm/i2c/Kconfig
Simple merge
diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
Simple merge
author	Russell King <[email protected]>
	Tue, 1 Nov 2016 09:17:57 +0000 (09:17 +0000)
committer	Russell King <[email protected]>
	Tue, 1 Nov 2016 09:17:57 +0000 (09:17 +0000)
		1	2
arch/arm/boot/dts/am335x-boneblack.dts	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i2c/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i2c/tda998x_drv.c	patch \|	diff1 \|	diff2 \|	blob \| history