Merge tag 'drm-misc-next-fixes-2017-02-15' of git://anongit.freedesktop.org/git/drm...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bbf74a9d6b473a587115b81abb0d231eaa086dd0..adfc60d9c456ce2afbc32dcb6b096cf8977ebf4a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3960,7 +3960,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
@@ -3970,6 +3970,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
@@ -13453,6 +13454,7 @@ F:      arch/x86/
 
 X86 PLATFORM DRIVERS
 M:     Darren Hart <dvhart@infradead.org>
+M:     Andy Shevchenko <andy@infradead.org>
 L:     platform-driver-x86@vger.kernel.org
 T:     git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
 S:     Maintained