diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-09 16:47:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-09 16:47:00 +0000 |
| commit | 19f15f0efdbdffeb29072208cfc666f61bf9897a (patch) | |
| tree | 3fb72fcbe799de3cf52060df48383ff99a8290b4 /drivers/spi/spi.c | |
| parent | fad8f9c0b28ff1b9c93ea91048c0be701407eb67 (diff) | |
| parent | caae070c48f39b4f7312e7473f6d3576f426e7fb (diff) | |
| parent | 24bc89716163b4e30c1b71c9f4bd020387b13c96 (diff) | |
Merge branches 'spi-core' and 'spi-tegra' into spi-next