diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-30 00:51:17 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-30 00:51:17 +0000 |
commit | 6e07b9179aa0f85d16b95a7d5d2a48c7a145291a (patch) | |
tree | 5b7c5fb534404ea19b2f91c661f8d6bcb1096764 /drivers/spi/spi-atmel.c | |
parent | 3bcbc14911b82c245dc43dd02fbf85725b620e6c (diff) | |
parent | 8fc39b516623f3beed18be701d2acfe0e50b8d86 (diff) | |
parent | 3a44623d5e1404b29786f1afd225d1aa04a4ae90 (diff) | |
parent | 3d8c869796b61f2dd7c1b84112902e199936c053 (diff) | |
parent | 5c5989ccd32c37890115a6dd5c03f39cba7f7beb (diff) | |
parent | cdd1945bde1e03149899a5d65c54fc0f163d24ac (diff) | |
parent | fb534f10755954827a4b71b9a21f9b5fa93707a9 (diff) | |
parent | 14c48ab2d9be451ff51783cfb9996428b145e878 (diff) | |
parent | 7984b5ca5c6245e332adcb8a8c2aefb2732b40bf (diff) |
Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x-psc', 'spi/topic/mpc52xx', 'spi/topic/mxs', 'spi/topic/nuc900', 'spi/topic/oc-tiny' and 'spi/topic/octeon' into spi-next