diff options
author | Arnd Bergmann <arnd@arndb.de> | 2021-04-08 23:02:11 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-08 23:02:11 +0300 |
commit | a0c97a6bd63019707f16d36812a5aa2fce3fe29f (patch) | |
tree | bd9744e69d7f885c267aa4274cfbebab3149e222 /tools/perf/scripts/python | |
parent | f47e8e14373a731ab4fbd08615b2694ce1fc5142 (diff) | |
parent | 6031008780efaada18087eba7ec84fe149f124a9 (diff) | |
download | linux-a0c97a6bd63019707f16d36812a5aa2fce3fe29f.tar.xz |
Merge tag 'samsung-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc
Samsung mach/soc changes for v5.13
1. Update Krzysztof Kozlowski's email address in Maintainers.
2. Replace deprecated pwm_request() with pwm_get() in S3C24xx.
3. Correct kerneldoc.
* tag 'samsung-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: exynos: correct kernel doc in platsmp
ARM: s3c: Use pwm_get() in favour of pwm_request() in RX1950
MAINTAINERS: use Krzysztof Kozlowski's Canonical address
Link: https://lore.kernel.org/r/20210407065828.7213-3-krzysztof.kozlowski@canonical.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions