diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-04 17:31:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-04 17:31:49 +0000 |
| commit | ae218f7847fcf32e75ba82b1f3ab01fe53731d7a (patch) | |
| tree | aeb782a46c38b1fa561aef92c65125bf29cbafa6 /drivers/spi/spi.c | |
| parent | 32215a6c6beb8dcda4bb0759b04ce3c30927963b (diff) | |
| parent | 5132b3d283710d196cd8af99b5585507e8b30709 (diff) | |
| download | blackbird-op-linux-ae218f7847fcf32e75ba82b1f3ab01fe53731d7a.tar.gz blackbird-op-linux-ae218f7847fcf32e75ba82b1f3ab01fe53731d7a.zip | |
Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-4.21 mode conflict
Diffstat (limited to 'drivers/spi/spi.c')
0 files changed, 0 insertions, 0 deletions
