Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl', 'spi/topic/fsl-espi...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:38 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:38 +0000 (17:08 +0100)
commit8fb3b066a60ec1e39dc2f91eb87e91f434e4da81
tree1f8ae912ba3afb079eb0f5ba7fa8f0ecf67f6074
parent446fe5e2d5616eb52c928e58f16558ab7c0d2414
parentbf61fb805ce8f60a02c69abf249832bb306e2fe2
parent7a40054361162d2f78f332aa868fed137beb7901
parenta2cb1be18254fd1479d87f7860af7a8413508e16
parentb2fb1872d3d912dcf81ec71a345fd3dcf81a066d
Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/fsl', 'spi/topic/fsl-espi' and 'spi/topic/id-const' into spi-next
drivers/spi/spi-fsl-espi.c
drivers/spi/spi-qup.c