diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 11:29:27 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 11:29:27 +1000 |
commit | 870e859c4210d320ded15acac751a34a7c8dcc43 (patch) | |
tree | f4f84d7cdcb35798a3fc2d1d75c76592c6528aed /drivers/dma-buf/Kconfig | |
parent | ad9dd1674d6bee8c27f02f6c61e5328cbc0bfb64 (diff) | |
parent | 805ada63ba0567b15d10d40419bcc5e6f0b461e6 (diff) | |
download | linux-next-870e859c4210d320ded15acac751a34a7c8dcc43.tar.gz |
Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git
# Conflicts:
# drivers/gpu/drm/i915/display/intel_dp.c
Diffstat (limited to 'drivers/dma-buf/Kconfig')
0 files changed, 0 insertions, 0 deletions