diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 18:08:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 18:08:31 +0200 |
| commit | 03689d2d75d38dd77c8148b742aa5a7befbcd736 (patch) | |
| tree | bef38656c77f54882480ea5bb4b1767a8d337a80 /drivers/video/fbdev/asiliantfb.c | |
| parent | Linux 3.15-rc8 (diff) | |
| parent | spi: qup: Correct selection of FIFO/Block mode (diff) | |
| parent | spi/topcliff-pch: Fix Kconfig dependencies (diff) | |
| download | linux-03689d2d75d38dd77c8148b742aa5a7befbcd736.tar.xz linux-03689d2d75d38dd77c8148b742aa5a7befbcd736.zip | |
Merge remote-tracking branches 'spi/fix/qup' and 'spi/fix/topcliff-pch' into spi-linus