summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 00:51:48 +0000
committerMark Brown <broonie@linaro.org>2014-03-30 00:51:48 +0000
commit45b15d98a96ffdb3c608bdad952f51930c151420 (patch)
treec12de44b4e63bde106ff4f4b98efca6e781ec985 /drivers/spi
parentb1ad487c42e982bb30f10bfb267f71c5daa3a0d5 (diff)
parent6ff8672a96a01ec0861784b23be48a32443269f7 (diff)
parentbe8dde46750be49fbf161dccd568b5cd14d3f004 (diff)
Merge remote-tracking branches 'spi/topic/xilinx' and 'spi/topic/xtfpga' into spi-next