diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 20:06:24 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 20:06:24 +0400 |
| commit | 0adcdeed6f87ac7230c9a0364ac785b8e70ad275 (patch) | |
| tree | 77fd04c067b024887d801778227501762bdf2ddd /Makefile | |
| parent | 4fce628f685945df4fd6fa1cab6f7eb397dc9267 (diff) | |
| parent | 8010dad55a0ab0e829f3733854e5235eef4e2734 (diff) | |
| download | linux-0adcdeed6f87ac7230c9a0364ac785b8e70ad275.tar.xz | |
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 'Makefile')
0 files changed, 0 insertions, 0 deletions