diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-27 21:47:37 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-27 21:47:37 +0300 |
| commit | 5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc (patch) | |
| tree | 79be85d4598b85cc2f9ba5700dac7bd04d4083b7 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | a750b124cfd27bae1a12df22318db5a2083dfb12 (diff) | |
| parent | 145367baa492246cc19d7e859db642e6fed6908e (diff) | |
| download | linux-5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc.tar.xz | |
Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bcm2835
Conflicts:
drivers/spi/spi-bcm2835.c
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions