diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:32:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 13:32:05 +1100 |
| commit | 592410b1ba9daf61c3bde92762a43eac58000850 (patch) | |
| tree | 80b54178a129ec9988bfc978cb8914d4d6b7fb0d /tools/perf/util/annotate.c | |
| parent | a11acbbed1bf2fd3204027d2b2ac6246daf14445 (diff) | |
| parent | 45420d7053db484b4a254cbb36cf6174f483f7d6 (diff) | |
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi-mpc512x-psc.c
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions