diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-11 18:09:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-11 18:09:14 -0400 |
| commit | 35fbf8452ce6e7da4389d037a981c9d8d58dc1b7 (patch) | |
| tree | 78b2553134ac3a94d6efd5b48c9f0928845a4e54 | |
| parent | 431959c0793e0d399303a061424dbaa1b33eb940 (diff) | |
| parent | 7f43a87e06e2f19892ff3f278e0181cbf9901b15 (diff) | |
| parent | 63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa (diff) | |
| parent | e8361f70a85c3ecd8d5b971d4d8abcbb0f8586de (diff) | |
| parent | 09355402325819675027eda25aba7026a325390c (diff) | |
Merge remote-tracking branches 'spi/topic/fsl-cspi', 'spi/topic/fsl-dspi', 'spi/topic/imx' and 'spi/topic/of-id' into spi-next