summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-sh-sci.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-07 15:02:26 +0400
committerMark Brown <broonie@linaro.org>2013-10-07 15:02:26 +0400
commitdabefd56c6ee883bae0bdce4d5396c3f21286ab8 (patch)
tree2f629a4cfa71276b4afe947232f934f9b0887e7d /drivers/spi/spi-sh-sci.c
parent3b3a80019ff194e86e740ec2f013a8915efd1ccf (diff)
parent2fe7e4add3e53df7c1b97e32076f8390dd81c6b3 (diff)
downloadlinux-dabefd56c6ee883bae0bdce4d5396c3f21286ab8.tar.xz
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
Conflicts: drivers/spi/spi-ti-qspi.c
Diffstat (limited to 'drivers/spi/spi-sh-sci.c')
0 files changed, 0 insertions, 0 deletions