diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-30 00:51:34 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-30 00:51:34 +0000 |
commit | 81235b4ea3aa2e942ac37979433f41b748f12da1 (patch) | |
tree | c95a6038934aa552930d31765cc74742dc4171e6 /drivers/spi/spi-sh-msiof.c | |
parent | 17523680647be26cf792e58f6e8cccb0fd010fd4 (diff) | |
parent | 382ab20e8138083966b7bde141d3c6a79dda68bf (diff) | |
parent | 09e99bca8324c3335794b86802486bb5191861d5 (diff) | |
parent | 3abf0edd2c16326727326c35704ab9cad0529eda (diff) | |
parent | e2a0ba547ba31cd7b217cc948d93e4edc78cbcb1 (diff) | |
parent | ed8eb250d7b097dbd888e46ad0d35a2cb1858221 (diff) | |
parent | a82ba3a318dd5eaf1f3dcbc335f81770d557a4fc (diff) | |
parent | 4189a728ae26832edfabca300313e7fef2818d6f (diff) |
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/sh-hspi', 'spi/topic/sh-msiof', 'spi/topic/sh-sci', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next