diff options
author | 2014-07-12 09:47:12 -0700 | |
---|---|---|
committer | 2014-07-12 09:47:12 -0700 | |
commit | 2df9ce91e9418dba7fe4b12f0c9ae06650655a74 (patch) | |
tree | 1221e39458b9586094cc920d0c2d84e5c30a61cb /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'renesas-soc-cleanup2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup (diff) | |
parent | ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define (diff) | |
download | linux-dev-2df9ce91e9418dba7fe4b12f0c9ae06650655a74.tar.xz linux-dev-2df9ce91e9418dba7fe4b12f0c9ae06650655a74.zip |
Merge tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup
Merge "mmp for v3.17" from Haojian Zhuang:
* tag 'mmp-for-v3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
ARM: mmp: remove duplicate SM_SCLK_SM_SCLK define
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions