diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:54:05 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:54:05 +0000 |
commit | 0afa0724dfb0ee94bc1c85eee9e90318413af463 (patch) | |
tree | 5aa570ff037b7bdc46dceccc144c5000c26a77e4 /samples/mic | |
parent | 9b12be63021a20fc3b76a7b6194e23ef66c903c9 (diff) | |
parent | 5762ab71eb24a8393a167361510d7ca5e18c99f9 (diff) | |
parent | d7a32394e734a004126b454cf747befb626b93ac (diff) | |
parent | 768f3d9d80d28c0d2d3cb5774f220c04d4d3c6d8 (diff) | |
parent | 01affe239c642c2c6fccfcc97a8cf661e1ae07b4 (diff) |
Merge remote-tracking branches 'spi/topic/armada', 'spi/topic/ath79', 'spi/topic/atmel' and 'spi/topic/axi' into spi-next