diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-06 12:58:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-06 12:58:46 +0000 |
| commit | 4e72b4278dbc228e4dc453d4dfeca997e521d9af (patch) | |
| tree | 1dc67ebd3d5312671b7de0215b3bb23132fc4af9 | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | 5cc7b04740effa5cc0af53f434134b5859d58b73 (diff) | |
| parent | 2b9375b91bef65b837bed61a05fb387159b38ddf (diff) | |
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus