diff options
author | 2014-05-23 18:48:05 +0200 | |
---|---|---|
committer | 2014-05-23 21:57:52 +0200 | |
commit | a36d82e9d3c92f692c7ad68b72b4c1ea87905090 (patch) | |
tree | 6e18e218aa21c41fe336c38af0562560a447207c /tools/perf/scripts/python/syscall-counts.py | |
parent | Merge tag 'sunxi-core-for-3.16-2' of https://github.com/mripard/linux into next/soc (diff) | |
parent | Merge tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into depends/dma-ranges (diff) | |
download | wireguard-linux-a36d82e9d3c92f692c7ad68b72b4c1ea87905090.tar.xz wireguard-linux-a36d82e9d3c92f692c7ad68b72b4c1ea87905090.zip |
Merge branch 'depends/dma-ranges' into next/soc
This branch has been picked up by rmk to be merged through his tree,
and is required as a base for the keystone changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions