git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d12971 8cb46bd)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.