diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
| commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 (patch) | |
| tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | of/unittest: Fix of_platform_depopulate test case (diff) | |
| parent | of: Explicitly include linux/types.h in of_graph.h (diff) | |
| download | linux-a2166ca5f3204794e8b59f01c93a0f1564e3e138.tar.gz linux-a2166ca5f3204794e8b59f01c93a0f1564e3e138.zip | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts:
drivers/of/unittest.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions