diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 15:26:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 15:26:47 -0700 |
| commit | 9f48c89862e39b7f33b44123fc425cf901c89428 (patch) | |
| tree | 373886606ada8c2e0c362afbcce490af27d21552 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | thunderbolt: Use kcalloc (diff) | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-dev-9f48c89862e39b7f33b44123fc425cf901c89428.tar.xz linux-dev-9f48c89862e39b7f33b44123fc425cf901c89428.zip | |
Merge 3.16-rc5 into char-misc-next
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions