diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 00:01:42 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 00:01:42 +0300 |
commit | fdccc4fc45141cf0542966ca80a076b3192dbf7d (patch) | |
tree | d12ec33bd8cc9eca3a64f44a3f80f011c2da5694 /tools/perf/scripts/python/stackcollapse.py | |
parent | 3d12971ebd5c48f4d1d80ac993bf82af7545c239 (diff) | |
parent | 8cb46bd224a0ecfc759b685d4bb0538d8e7d51a7 (diff) | |
download | linux-fdccc4fc45141cf0542966ca80a076b3192dbf7d.tar.xz |
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
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions