summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-08 11:16:58 +0800
committerMark Brown <broonie@kernel.org>2015-02-08 11:16:58 +0800
commit30b9278bf56623307a04c97fd740a1379964ee82 (patch)
tree40399673d7cf71b6a504bb5f1c7646c499253119
parent4f9f4548a5c741412fffaf76530f243e319c41e8 (diff)
parentecedf5c8ed978116c57b4661651747d4bf3387b5 (diff)
parent7782a1a94825db5163f376beb8db6148fdf1aef0 (diff)
parentb85bfc444c426f476e68000d5b7e64a3200c3892 (diff)
parent060556a9bd7ac8d819c7321a3e7f73bfa1276f1d (diff)
Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev', 'spi/topic/st-ssc' and 'spi/topic/ti-qspi' into spi-next