diff options
author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:21:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:21:06 +0100 |
commit | 63a89274bd4a181aaa01c4ae2b07124e746239c6 (patch) | |
tree | 43ca446255becc7a9dbea5c358ecb04e3c55391c /drivers/spi/spi-atmel.c | |
parent | 9d540b0d4964603798efdccae90cab8ac06c8bf4 (diff) | |
parent | 6aba9c65649e5ef137bce7a958c0749f13af88a1 (diff) | |
parent | b85d65dd47e1606299dc054d2162b795df65c94a (diff) | |
parent | 35fc3b9ff66b907ca7a75c971decf291adf78131 (diff) | |
parent | 2c147776dc8b3d67ec42605dcba4deb98f2d0536 (diff) |
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx', 'spi/topic/davinci' and 'spi/topic/imx' into spi-next