Merge 3.16-rc6 into driver-core-next

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 61a8f486306b700749dce48b58ff63c856b3a5eb..11665a8984982531a5f6f074bafe9ebff1876600 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2913,8 +2913,8 @@ S:        Maintained
 L:     linux-media@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 L:     linaro-mm-sig@lists.linaro.org
-F:     drivers/base/dma-buf*
-F:     include/linux/dma-buf*
+F:     drivers/dma-buf/
+F:     include/linux/dma-buf* include/linux/reservation.h include/linux/*fence.h
 F:     Documentation/dma-buf-sharing.txt
 T:     git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git