diff options
author | Mark Brown <broonie@kernel.org> | 2016-10-29 12:51:55 -0600 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-10-29 12:51:55 -0600 |
commit | 2fbef66e1407d1b13d181f7f5614a5897b452188 (patch) | |
tree | 6b029b86240d197e4cf1f4f976a6b798587a5470 /kernel | |
parent | 07d9a380680d1c0eb51ef87ff2eab5c994949e69 (diff) | |
parent | e0af98a7e025a7263ae7e50264f6f79ed29642a7 (diff) | |
parent | 5ee67b587a2b0092bdea3123349c8c3c43e8e46e (diff) | |
parent | 5c0ba57744b1422d528f19430dd66d6803cea86f (diff) | |
download | linux-2fbef66e1407d1b13d181f7f5614a5897b452188.tar.bz2 |
Merge remote-tracking branches 'spi/fix/dt', 'spi/fix/fsl-dspi' and 'spi/fix/fsl-espi' into spi-linus