Merge remote-tracking branch 'hdlcd/for-upstream/hdlcd'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm64/boot/dts/arm/juno-base.dtsi
Simple merge
diff --cc drivers/gpu/drm/Kconfig
Simple merge
diff --cc drivers/gpu/drm/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/arm/juno-base.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history