summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-26 19:05:25 +0000
committerMark Brown <broonie@kernel.org>2014-11-26 19:05:25 +0000
commitec058615f1fbc03837ab048b1bb7291370b46cef (patch)
treeeb73289f1304e983fb739809daa7e1b7b66141b2
parent13616c71334a6024149a36d51db4bb000273da00 (diff)
parent0a8727e69778683495058852f783eeda141a754e (diff)
parent9c4b19a07dddda3ba35a2eb9b4134d485908e2f5 (diff)
Merge remote-tracking branches 'spi/fix/dw' and 'spi/fix/sirf' into spi-linus