diff options
author | 2014-04-05 20:45:55 +0530 | |
---|---|---|
committer | 2014-04-05 20:45:55 +0530 | |
commit | 8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd (patch) | |
tree | bc08b79fe11c4745434da1cebc5fb8936f9c6831 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | shdma: add R-Car Audio DMAC peri peri driver (diff) | |
parent | dmaengine: add Qualcomm BAM dma driver (diff) | |
download | linux-dev-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.tar.xz linux-dev-8673bcef8c1b07b83e9ee02d5e7f4b66507b03cd.zip |
Merge branch 'topic/bam' into for-linus
Conflicts:
drivers/dma/Makefile
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions