diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-30 00:51:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-30 00:51:48 +0000 |
| commit | 45b15d98a96ffdb3c608bdad952f51930c151420 (patch) | |
| tree | c12de44b4e63bde106ff4f4b98efca6e781ec985 | |
| parent | b1ad487c42e982bb30f10bfb267f71c5daa3a0d5 (diff) | |
| parent | 6ff8672a96a01ec0861784b23be48a32443269f7 (diff) | |
| parent | be8dde46750be49fbf161dccd568b5cd14d3f004 (diff) | |
Merge remote-tracking branches 'spi/topic/xilinx' and 'spi/topic/xtfpga' into spi-next