From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 8 Apr 2021 20:16:49 +0000 (+0200)
Subject: Merge branch 'arm/soc' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6939bdd5502bb1e923fd431b18a027817556c84d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'arm/soc' into for-next

* arm/soc:
  ARM: exynos: correct kernel doc in platsmp
  ARM: hisi: use the correct HiSilicon copyright
  ARM: s3c: Use pwm_get() in favour of pwm_request() in RX1950
  ARM: OMAP1: fix incorrect kernel-doc comment syntax in file
  ARM: OMAP2+: fix incorrect kernel-doc comment syntax in file
  ARM: OMAP2+: Use DEFINE_SPINLOCK() for spinlock
  ARM: OMAP2+: use true and false for bool variable
  ARM: OMAP2+: add missing call to of_node_put()
  ARM: OMAP2+: Replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE
  MAINTAINERS: use Krzysztof Kozlowski's Canonical address
---

6939bdd5502bb1e923fd431b18a027817556c84d