Merge tag 'zte-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 21:01:42 +0000 (23:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 21:01:42 +0000 (23:01 +0200)
commitfdccc4fc45141cf0542966ca80a076b3192dbf7d
treed12ec33bd8cc9eca3a64f44a3f80f011c2da5694
parent3d12971ebd5c48f4d1d80ac993bf82af7545c239
parent8cb46bd224a0ecfc759b685d4bb0538d8e7d51a7
Merge tag 'zte-dt-4.14' of git://git./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