diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-23 12:16:51 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-23 12:16:51 +0100 |
commit | b340941af9d85ca74d3efacb7210e95296c484aa (patch) | |
tree | 6669851e9b183e57800797e198974739d2e92e63 | |
parent | c36581c9a536405a4bb56f88d8d7c55f93d73cd1 (diff) | |
parent | 3ae36c8b67e450dcb7011181658c198bec386e98 (diff) | |
parent | b085c6129a8cabdad9c625fae56d9d3f2977808e (diff) | |
parent | 710a1d54452afbc9435bdb3f48f81f6801db14d6 (diff) | |
parent | 866e48b0994c6338e6aa4ae7c413b5888ab432d1 (diff) | |
parent | 21825ff11d683fa2fc0f5668cc2ec0a0652ee64b (diff) |
Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi/topic/orion', 'spi/topic/pic32' and 'spi/topic/pic32-qspi' into spi-next