summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-28 15:05:29 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-28 15:05:29 +0200
commitf4b81dd83e38277a3d1e6661f0fa8eea8cfe784b (patch)
tree84bf6d90bad6468e3835f5f4b5443766dec56bf7 /drivers/spi
parentLinux 3.6-rc7 (diff)
parentspi/imx: set the inactive state of the clock according to the clock polarity (diff)
parentMerge tag 'v3.6-rc6' into spi-mxs (diff)
downloadlinux-f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b.tar.xz
linux-f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b.zip
Merge branches 'spi-drivers' and 'spi-mxs' into spi-next