summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-01-31 21:23:51 +0000
committerMark Brown <broonie@kernel.org>2017-01-31 21:23:51 +0000
commit3f87493930a0f934549b04e100ecc2110e4f1efd (patch)
treeae5fc6e0df92ee4decc8bdc7cbe97cfab35580fe
parentaea6630e406ffa7b4962751b5fc3403ac59e9b12 (diff)
parent72bc7ae0633e2b580217d254114ac6650380b7f6 (diff)
parente7ad4a73364c21f40963a35631b285b60fa3198c (diff)
parentc2e51ac3d0542440d5b2b8b52ff2ad00751af4da (diff)
parent45e861a1c12cfd717b8e47103f1aaf2e34cc6688 (diff)
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next