diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 17:20:59 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 17:20:59 +0100 |
commit | 8331c49c48af37f435aa9d9daa3b2ce38db64856 (patch) | |
tree | ca9781d59410ef02de2d935eae87984162255f58 /usr | |
parent | 95607c3033ae5ad72b0433e1c2d4bd75b9741214 (diff) | |
parent | e138d4333aa02a3daa12c04192bc5c842bffee74 (diff) | |
parent | 09a5ae80be1caf42418045448fb291388a1b16c6 (diff) | |
parent | 4b153a2137c5d2914794c8944d78c731c1b0ae9d (diff) |
Merge remote-tracking branches 'spi/fix/s3c64xx', 'spi/fix/samsung' and 'spi/fix/xilinx' into spi-linus