summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-10-25 14:06:34 +0200
committerMark Brown <broonie@kernel.org>2017-10-25 14:06:34 +0200
commit7555aa766b63f00fea8280883eb7db6834204605 (patch)
tree35136ce915d4dc475cb928b71a3675025c5141ad /include
parentbb176f67090ca54869fc1262c913aa69d2ede070 (diff)
parent5a866ec0014b2baa4ecbb1eaa19c835482829d08 (diff)
parent226584aedd94acd61ffa51fb69bcf6b3309a7b8f (diff)
parentc0368e4db4a3e8a3dce40f3f621c06e14c560d79 (diff)
parent8b5d729a3a8a07fe273af266e90bc52114dd69a6 (diff)
parenta2b4a79b88b24c49d98d45a06a014ffd22ada1a4 (diff)
Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/idr', 'spi/fix/qspi', 'spi/fix/stm32' and 'spi/fix/uapi' into spi-linus