diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:16 +0000 |
| commit | c70efb85153162295dc80099e95dab93d486a3ed (patch) | |
| tree | 6752921839b268182d82dcda1dfaeeacfd1f52c3 /drivers/video/fbdev/atafb_iplan2p2.c | |
| parent | 4c84518523f888994c618585021c76fa499d465e (diff) | |
| parent | 88d4a7440e51754bd44f58fe1f8c6e6fe050e929 (diff) | |
| parent | e6b5140b706689a38aaeabd9de8fb3e1531cf9cb (diff) | |
| parent | fc306de9b54e94a2949fee452741c00259d7dd4a (diff) | |
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next