diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 17:06:24 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 17:06:24 +0100 |
| commit | 0adcdeed6f87ac7230c9a0364ac785b8e70ad275 (patch) | |
| tree | 77fd04c067b024887d801778227501762bdf2ddd /drivers/dma/Makefile | |
| parent | Merge branch 'topic/defer_probe' into for-linus (diff) | |
| parent | dma: add dma_get_any_slave_channel(), for use in of_xlate() (diff) | |
| download | linux-0adcdeed6f87ac7230c9a0364ac785b8e70ad275.tar.xz linux-0adcdeed6f87ac7230c9a0364ac785b8e70ad275.zip | |
Merge branch 'topic/of' into for-linus
Conflicts:
drivers/dma/mmp_pdma.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/Makefile')
0 files changed, 0 insertions, 0 deletions