diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-11 14:28:35 +0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-11 14:28:35 +0700 |
commit | f91c75d6faefdded97d2ecbe8c4f9cf197f68110 (patch) | |
tree | 3f3b40f5baeef88a1dd8dda4eee48593c325dbe3 /drivers/video/fbdev/ocfb.c | |
parent | 6beb9fecbde45f09ea79a67ed5fd8d17e3bf6213 (diff) | |
parent | ee7683a31683c6368a66a83c555600dfd704e543 (diff) | |
parent | 2f6fdefb3503ff0600b5435c0c9ce43cb50d3f1a (diff) | |
parent | 49023d2e4ead0fc9e0896331037746b267d46ad4 (diff) | |
download | talos-op-linux-f91c75d6faefdded97d2ecbe8c4f9cf197f68110.tar.gz talos-op-linux-f91c75d6faefdded97d2ecbe8c4f9cf197f68110.zip |
Merge remote-tracking branches 'spi/topic/doc', 'spi/topic/dw' and 'spi/topic/flash' into spi-next