summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-05-11 17:29:49 +0100
committerMark Brown <broonie@kernel.org>2015-05-11 17:29:49 +0100
commitc8b350424d1862619c311204290cd42bae4ebaa3 (patch)
treebe7e532aaaf836f65dc2ae2bd3f611e78d0ba015 /drivers/spi
parentbed5e4d8294249ea1f05dade879a51733484be42 (diff)
parent73ee39a4c944a11cfd6d43ba1f634da340bf5537 (diff)
parent50574dd2f63ed0afc3b666da27eb7062d26a39c5 (diff)
parent2000058e892cd6773b3061a56c0bd6535ac15afe (diff)
Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix/fsl-espi' into spi-linus