diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-09 17:47:00 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-09 17:47:00 +0100 |
commit | 19f15f0efdbdffeb29072208cfc666f61bf9897a (patch) | |
tree | 3fb72fcbe799de3cf52060df48383ff99a8290b4 /drivers/spi/spi.c | |
parent | Merge branch 'spi-fix-s3c64xx' into spi-next (diff) | |
parent | spi: Dont call master->setup if not populated (diff) | |
parent | spi: tegra: sequence compatible strings as per preference (diff) | |
download | linux-19f15f0efdbdffeb29072208cfc666f61bf9897a.tar.xz linux-19f15f0efdbdffeb29072208cfc666f61bf9897a.zip |
Merge branches 'spi-core' and 'spi-tegra' into spi-next