Merge branch 'firefly' into squashCM
authorT-Firefly <account@t-firefly.com>
Sat, 19 Aug 2017 08:26:44 +0000 (16:26 +0800)
committerT-Firefly <account@t-firefly.com>
Sat, 19 Aug 2017 08:26:44 +0000 (16:26 +0800)
commit03452962acf3c6afc8a311079b7687e0c9a57a56
tree0cd7eba87d87a7a16a9ff8d4ccb38132a48fbffd
parent941e22553dc5b8ddd0d363296499966c7ad29818
parent03d6a385ab6c876d5cf54261401799c4763360ba
Merge branch 'firefly' into squashCM

Change-Id: I53c4317c04c651aabdd91052263e64adef55bd5c
arch/arm64/boot/dts/rockchip/rk3399.dtsi
arch/arm64/configs/rockchip_linux_defconfig
drivers/char/Kconfig
drivers/gpu/drm/panel/panel-simple.c
drivers/input/touchscreen/Makefile
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
drivers/usb/serial/option.c