diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:09 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:58 +0300 |
| commit | 7d6aa9ba4f8228c75970fc4fad27194611a548a6 (patch) | |
| tree | 4bbd64f6671391d6d93c1a1806ffec005114524e /Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | |
| parent | 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 (diff) | |
| parent | fe23d63422c83cd7c8154dc7faef6af97be4b948 (diff) | |
| download | linux-7d6aa9ba4f8228c75970fc4fad27194611a548a6.tar.xz | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging to get the mac80211 updates that have since propagated
into net-next.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml b/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml index 64bca41031d5..e82c9a07b6fb 100644 --- a/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml +++ b/Documentation/devicetree/bindings/mmc/allwinner,sun4i-a10-mmc.yaml @@ -11,7 +11,7 @@ allOf: maintainers: - Chen-Yu Tsai <wens@csie.org> - - Maxime Ripard <maxime.ripard@bootlin.com> + - Maxime Ripard <mripard@kernel.org> properties: "#address-cells": true |