diff options
| author | Thomas Zimmermann | 2023-04-16 18:50:39 +0200 |
|---|---|---|
| committer | Thomas Zimmermann | 2023-04-16 20:11:53 +0200 |
| commit | 7f6f26d7adee150e09d7537acc6d6894c27c0b7a (patch) | |
| tree | 8706529cde6e982b9382fc6bf83b3ff470493342 /.rustfmt.toml | |
| parent | 116b1c5a364bcbdc40be64d4f3ec9dbc32e264dd (diff) | |
| parent | afa351a15d80993f8ba6ae28652cc23127237e37 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to '.rustfmt.toml')
0 files changed, 0 insertions, 0 deletions