diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-30 01:51:48 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-30 01:51:48 +0100 |
commit | 45b15d98a96ffdb3c608bdad952f51930c151420 (patch) | |
tree | c12de44b4e63bde106ff4f4b98efca6e781ec985 /drivers/spi/spi-xilinx.c | |
parent | Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/... (diff) | |
parent | spi: xilinx: remove unnecessary spaces (diff) | |
parent | spi: xtensa-xtfpga: Enable driver compilation with COMPILE_TEST (diff) | |
download | linux-45b15d98a96ffdb3c608bdad952f51930c151420.tar.xz linux-45b15d98a96ffdb3c608bdad952f51930c151420.zip |
Merge remote-tracking branches 'spi/topic/xilinx' and 'spi/topic/xtfpga' into spi-next