diff options
author | 2015-04-27 19:47:37 +0100 | |
---|---|---|
committer | 2015-04-27 19:47:37 +0100 | |
commit | 5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc (patch) | |
tree | 79be85d4598b85cc2f9ba5700dac7bd04d4083b7 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | spi: bcm2835: fallback to interrupt for polling timeouts exceeding 2 jiffies (diff) | |
parent | spi: bcm2835: change timeout of polling driver to 1s (diff) | |
download | wireguard-linux-5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc.tar.xz wireguard-linux-5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc.zip |
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/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions