diff options
author | 2015-10-31 07:36:55 +0530 | |
---|---|---|
committer | 2015-10-31 07:36:55 +0530 | |
commit | 7d9d43ace29be375d3d1654b688b94029308a1be (patch) | |
tree | b5dd459d5cd5541636f09342a5d9a08dd3822af8 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'topic/dw' into for-linus (diff) | |
parent | ARM: DTS: am437x: Use the new DT bindings for the eDMA3 (diff) | |
download | linux-dev-7d9d43ace29be375d3d1654b688b94029308a1be.tar.xz linux-dev-7d9d43ace29be375d3d1654b688b94029308a1be.zip |
Merge branch 'topic/edma' into for-linus
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/edma.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions