Merge branch 'topic/3wire-gpio' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@kernel.org>
Tue, 4 Dec 2018 17:31:49 +0000 (17:31 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 4 Dec 2018 17:31:49 +0000 (17:31 +0000)
commitae218f7847fcf32e75ba82b1f3ab01fe53731d7a
treeaeb782a46c38b1fa561aef92c65125bf29cbafa6
parent32215a6c6beb8dcda4bb0759b04ce3c30927963b
parent5132b3d283710d196cd8af99b5585507e8b30709
Merge branch 'topic/3wire-gpio' of https://git./linux/kernel/git/broonie/spi into spi-4.21 mode conflict
include/linux/spi/spi.h