summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-07 11:43:39 +0100
committerMark Brown <broonie@kernel.org>2015-10-07 11:43:39 +0100
commitc2c80bdb9e91b412ea68f6dcc49c5d7b91e0b930 (patch)
tree4e87abf632823d52cf71e8f26bf8b5083ffd2ec4
parent049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff)
parent8494cdea2223b66491df1264619e2205b4487913 (diff)
parenteb8d0ac4afd8b15ac88f8a50342b32774ff881ed (diff)
Merge remote-tracking branches 'spi/fix/davinci' and 'spi/fix/sh-msiof' into spi-linus