diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-28 15:05:29 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-28 15:05:29 +0200 |
commit | f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b (patch) | |
tree | 84bf6d90bad6468e3835f5f4b5443766dec56bf7 /drivers/spi/Makefile | |
parent | Linux 3.6-rc7 (diff) | |
parent | spi/imx: set the inactive state of the clock according to the clock polarity (diff) | |
parent | Merge tag 'v3.6-rc6' into spi-mxs (diff) | |
download | linux-f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b.tar.xz linux-f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b.zip |
Merge branches 'spi-drivers' and 'spi-mxs' into spi-next