diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:07:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:07:08 +1100 |
| commit | def0451540b29e2cac571d23f21339c1a3914625 (patch) | |
| tree | 66ea656ddeb6357ba18d99abda0ee3496312ba5e /MAINTAINERS | |
| parent | ad7b78d2e5105e46c577ab24aa7d565bfdaaa611 (diff) | |
| parent | 13f62f54d174d3417c3caaafedf5e22a0a03e442 (diff) | |
Merge remote-tracking branch 'drm/drm-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4fad3254f7b6..a38f0022f8ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4012,7 +4012,7 @@ F: drivers/dma-buf/ F: include/linux/dma-buf* F: include/linux/reservation.h F: include/linux/*fence.h -F: Documentation/dma-buf-sharing.txt +F: Documentation/driver-api/dma-buf.rst T: git git://anongit.freedesktop.org/drm/drm-misc SYNC FILE FRAMEWORK @@ -4022,6 +4022,7 @@ S: Maintained L: linux-media@vger.kernel.org L: dri-devel@lists.freedesktop.org F: drivers/dma-buf/sync_* +F: drivers/dma-buf/dma-fence* F: drivers/dma-buf/sw_sync.c F: include/linux/sync_file.h F: include/uapi/linux/sync_file.h |