diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-26 17:57:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-26 17:57:21 +0000 |
| commit | 7a4e28ab1a8def934287d5435255466faa4fc1a1 (patch) | |
| tree | 70b1118c209829534f964a34d1cd670325f87942 | |
| parent | 0c5b9b5d9adbad4b60491f9ba0d2af38904bb4b9 (diff) | |
| parent | d593574aff0ab846136190b1729c151c736727ec (diff) | |
| parent | 89434c3c35081439627baa2225622d5bd12242fe (diff) | |
Merge remote-tracking branches 'spi/fix/imx' and 'spi/fix/sh-msiof' into spi-linus