diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:31 +0000 |
| commit | d426a842b0c203c182ec2658efc4282ef1eb80be (patch) | |
| tree | 5fb25f28f792c523d9212dd1111642831b17f5f3 | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| parent | 973fbce69ed8e79b5fe3ad19cfecb581a7ef8048 (diff) | |
| parent | a02bb401f8ae264be782ee57d98bdd99f14c8022 (diff) | |
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/imx' into spi-linus