| commit | ae218f7847fcf32e75ba82b1f3ab01fe53731d7a | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Tue Dec 04 17:31:49 2018 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Tue Dec 04 17:31:49 2018 +0000 |
| tree | aeb782a46c38b1fa561aef92c65125bf29cbafa6 | |
| parent | 32215a6c6beb8dcda4bb0759b04ce3c30927963b [diff] | |
| parent | 5132b3d283710d196cd8af99b5585507e8b30709 [diff] |
Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-4.21 mode conflict