diff options
| author | Mark Brown | 2017-07-03 16:21:12 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-07-03 16:21:12 +0100 |
| commit | 082f6968bb204d1a3d8b2da3c53d6b7a59bbd985 (patch) | |
| tree | 26f3b91458ec899fdeb7204f1616a01bf6aceaa3 /block/blk-settings.c | |
| parent | cc7e35baca2edade2972da753d8cae09cae1aade (diff) | |
| parent | f7929436a286ca31f0365a7013de968017f76818 (diff) | |
| parent | 0b0cda4102de7a3dbcedfb5f943a5d08e4ec8500 (diff) | |
| parent | 7b821a6485c943edc752a94260a29116237f9153 (diff) | |
Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/st-ssc4' and 'spi/topic/stm32' into spi-next