diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 14:09:35 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 14:09:35 +0200 |
commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml | |
parent | powerpc/eeh: Remove unused inline functions (diff) | |
parent | Linux 5.18-rc4 (diff) | |
download | linux-d0a31acc34dc2921ad32a67a7534704114e64f82.tar.xz linux-d0a31acc34dc2921ad32a67a7534704114e64f82.zip |
Merge tag 'v5.18-rc4' into next
Merge master into next, to bring in commit 5f24d5a579d1 ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
Diffstat (limited to 'Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml b/Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml index 5531718abdf0..10c7b408f33a 100644 --- a/Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml +++ b/Documentation/devicetree/bindings/mfd/samsung,s5m8767.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Samsung S5M8767 Power Management IC maintainers: - - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> + - Krzysztof Kozlowski <krzk@kernel.org> description: | This is a part of device tree bindings for S2M and S5M family of Power |