From: Arnd Bergmann Date: Fri, 18 Aug 2017 21:01:42 +0000 (+0200) Subject: Merge tag 'zte-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Tag: v4.14-rc1~66^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdccc4fc45141cf0542966ca80a076b3192dbf7d;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'zte-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt Pull "ZTE device tree updates for 4.14" from Shawn Guo: - A clean up patch from Shawn Lin to remove the deprecated dwmmc property 'num-slots'. * tag 'zte-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: zte: remove num-slots from zx296702-ad1 --- fdccc4fc45141cf0542966ca80a076b3192dbf7d