diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-03-11 17:45:54 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-03-11 17:45:54 -0500 |
| commit | f5539af572ffa35545f21f604fb747eae55c8042 (patch) | |
| tree | 86b0e51b9257ce8ffc63bebb379259e7f4ff4bf9 | |
| parent | 0670e7157f75ec6d2231fbc6f67b075d6b6d486f (diff) | |
| parent | 4abed0af1e9bc911f28bb525eece522d94d047f2 (diff) | |
Merge branch 'dmaengine-fixes' into dmaengine
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 55592f8b672c..e2f0992ea4a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2124,6 +2124,7 @@ S: Supported | |||
| 2124 | F: fs/dlm/ | 2124 | F: fs/dlm/ |
| 2125 | 2125 | ||
| 2126 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM | 2126 | DMA GENERIC OFFLOAD ENGINE SUBSYSTEM |
| 2127 | M: Vinod Koul <vinod.koul@intel.com> | ||
| 2127 | M: Dan Williams <dan.j.williams@intel.com> | 2128 | M: Dan Williams <dan.j.williams@intel.com> |
| 2128 | S: Supported | 2129 | S: Supported |
| 2129 | F: drivers/dma/ | 2130 | F: drivers/dma/ |