Commit ec9c8807 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 1707c39a ("Merge tag 'driver-core-6.0-rc7' of...

Merge 1707c39a ("Merge tag 'driver-core-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core"

) driver-core-next

This merges the driver core changes in 6.0-rc7 into driver-core-next as
they are needed here as well for testing.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents a791dc13 1707c39a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ Morten Welinder <welinder@troll.com>
Mythri P K <mythripk@ti.com>
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
Nguyen Anh Quynh <aquynh@gmail.com>
Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson Firmware registers Interface

maintainers:
  - Neil Armstrong <narmstrong@baylibre.com>
  - Neil Armstrong <neil.armstrong@linaro.org>

description: |
  The Meson SoCs have a register bank with status and data shared with the
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic specific extensions to the Synopsys Designware HDMI Controller

maintainers:
  - Neil Armstrong <narmstrong@baylibre.com>
  - Neil Armstrong <neil.armstrong@linaro.org>

allOf:
  - $ref: /schemas/sound/name-prefix.yaml#
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson Display Controller

maintainers:
  - Neil Armstrong <narmstrong@baylibre.com>
  - Neil Armstrong <neil.armstrong@linaro.org>

description: |
  The Amlogic Meson Display controller is composed of several components
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter)

maintainers:
  - Andrzej Hajda <andrzej.hajda@intel.com>
  - Neil Armstrong <narmstrong@baylibre.com>
  - Neil Armstrong <neil.armstrong@linaro.org>
  - Robert Foss <robert.foss@linaro.org>

properties:
Loading