aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-09 16:47:00 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-09 16:47:00 +0000
commit19f15f0efdbdffeb29072208cfc666f61bf9897a (patch)
tree3fb72fcbe799de3cf52060df48383ff99a8290b4 /drivers/spi/spi.c
parentMerge branch 'spi-fix-s3c64xx' into spi-next (diff)
parentspi: Dont call master->setup if not populated (diff)
parentspi: tegra: sequence compatible strings as per preference (diff)
downloadlinux-dev-19f15f0efdbdffeb29072208cfc666f61bf9897a.tar.xz
linux-dev-19f15f0efdbdffeb29072208cfc666f61bf9897a.zip
Merge branches 'spi-core' and 'spi-tegra' into spi-next