diff options
author | 2018-05-14 01:05:30 -0700 | |
---|---|---|
committer | 2018-05-14 01:05:30 -0700 | |
commit | 115c93e5000b6ae6921348172e0124eb09f0a584 (patch) | |
tree | 8b3ee47e4143522af0d6deebf5877fe23a5910a1 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'scmi-fixes-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes (diff) | |
parent | ARM: dts: imx51-zii-rdu1: fix touchscreen bindings (diff) | |
download | linux-dev-115c93e5000b6ae6921348172e0124eb09f0a584.tar.xz linux-dev-115c93e5000b6ae6921348172e0124eb09f0a584.zip |
Merge tag 'imx-fixes-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 4.17:
- Add missing 'fsl,sec-era' property for i.MX7S device tree CAAM node,
as the era information is used in various places inside CAAM driver.
- There are a few errors in imx51-zii-rdu1 device tree touchscreen
node. Fix them to get touchscreen actually work.
* tag 'imx-fixes-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx51-zii-rdu1: fix touchscreen bindings
ARM: dts: imx7s: Pass the 'fsl,sec-era' property
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions