diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 12:26:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 12:26:37 -0500 |
| commit | 46c5b83bcc5ab4db34716954fc64645eba7038ca (patch) | |
| tree | a0b722a2133a50e66aded651b48c65688c0713a5 | |
| parent | 7908b3ef6809e49c77d914342dfaa4b946476d7a (diff) | |
| parent | 53b6b3e00b8454aeab497119443d4f365ee4e46e (diff) | |
Merge branch 'for-linus-3.3' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
* 'for-linus-3.3' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
MAINTAINERS: Add dma-buf sharing framework maintainer
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 89b70df91f4f..93c68d5f1cf4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2246,6 +2246,17 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git | |||
| 2246 | S: Supported | 2246 | S: Supported |
| 2247 | F: fs/dlm/ | 2247 | F: fs/dlm/ |
| 2248 | 2248 | ||
| 2249 | DMA BUFFER SHARING FRAMEWORK | ||
| 2250 | M: Sumit Semwal <sumit.semwal@linaro.org> | ||
| 2251 | S: Maintained | ||
| 2252 | L: linux-media@vger.kernel.org | ||
| 2253 | L: dri-devel@lists.freedesktop.org | ||
| 2254 | L: linaro-mm-sig@lists.linaro.org | ||
| 2255 | F: drivers/base/dma-buf* | ||
| 2256 | F: include/linux/dma-buf* | ||
| 2257 | F: Documentation/dma-buf-sharing.txt | ||
| 2258 | T: git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git | ||
| 2259 | |||
| 2249 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM | 2260 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM |
| 2250 | M: Vinod Koul <vinod.koul@intel.com> | 2261 | M: Vinod Koul <vinod.koul@intel.com> |
| 2251 | M: Dan Williams <dan.j.williams@intel.com> | 2262 | M: Dan Williams <dan.j.williams@intel.com> |