commit | 4304e1cae0e1dd9da7d1a8f8e21e44e4929e428b | [log] [tgz] |
---|---|---|
author | Geert Uytterhoeven <geert+renesas@glider.be> | Tue May 21 10:26:55 2019 +0200 |
committer | Geert Uytterhoeven <geert+renesas@glider.be> | Tue May 21 10:26:55 2019 +0200 |
tree | 9e9c6c81f1dff65b109e359b561da5df54fc4e9f | |
parent | cef62bcf2e61da444f2a5df141f09eb8e8c70ae2 [diff] | |
parent | 201bd433bfa36c8b1de3c71f59d04bf5b58adfd9 [diff] |
Merge remote-tracking branch 'drm-misc/for-linux-next' into renesas-drivers Conflicts: Documentation/devicetree/bindings/vendor-prefixes.txt Documentation/devicetree/bindings/vendor-prefixes.yaml