diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 12:17:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 12:17:20 +0000 |
| commit | 0e647037fed5632e7c5989ec359ab84c676888ac (patch) | |
| tree | e69061b2344fd5802b2fe12590c8e1588eaee3cb /drivers/spi | |
| parent | f56be67b190a95b9e2d4d9bd30b61907cabcf443 (diff) | |
| parent | 9169051617df7fca597274e9e43324332cb8f0ee (diff) | |
| parent | 7d57cd8946f21db2194154af1b95238af8579f9e (diff) | |
Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/txx9' into spi-next