diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-30 00:50:57 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-30 00:50:57 +0000 |
commit | 0f38af451fc494378110d702058acf59d24b5331 (patch) | |
tree | 5f061ea6cf7b3f31c002d1aa38fb782881620671 /drivers/spi/spi-atmel.c | |
parent | a78389844ea95f18aadda79246587c707586ce89 (diff) | |
parent | bf2f2f7958388b2000736452fd7a126182ee69d0 (diff) | |
parent | 54f4c51cc1634ab91074389dd6809af938a72778 (diff) | |
parent | 0dd26e53b56137431e373c781fe2984393c9d573 (diff) | |
parent | 7f8cf088f027885d78dca6cc2ca7566d8e894c6e (diff) | |
parent | 1480916ebd6fc9c54da5e9e09cf342a061063e39 (diff) | |
parent | 6e3bc2b7b39e565f61665ae84f41e5ccb791992b (diff) | |
parent | d9721ae1493725bb14dcd1a3c19bbb5795e4a42f (diff) | |
parent | aa188f90ff1a82fa8f848092ff4969dba78b275f (diff) | |
download | linux-stable-0f38af451fc494378110d702058acf59d24b5331.tar.gz linux-stable-0f38af451fc494378110d702058acf59d24b5331.tar.bz2 linux-stable-0f38af451fc494378110d702058acf59d24b5331.zip |
Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/atmel', 'spi/topic/au1550', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bfin5xx', 'spi/topic/bitbang' and 'spi/topic/bpw' into spi-next