summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-sun4i.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 16:48:38 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 16:48:38 +0000
commitcabeea980879c2c701b0bd03f145c9f7dae17a63 (patch)
treef59ab6f64c43f9dd213aae8ef905ec5817ba5681 /drivers/spi/spi-sun4i.c
parent4f9530705b7b9c977044accb035682d9f7df1cdd (diff)
parent47284e3e0f3c427c93f8583549b6c938e8a18015 (diff)
parentf05ca854b3df79bf6596de5102eb99ca10d6089f (diff)
parent9d0c1c3332b49570454bb11e55d3c6c7993163da (diff)
downloadlinux-cabeea980879c2c701b0bd03f145c9f7dae17a63.tar.gz
linux-cabeea980879c2c701b0bd03f145c9f7dae17a63.tar.bz2
linux-cabeea980879c2c701b0bd03f145c9f7dae17a63.zip
Merge remote-tracking branches 'spi/topic/sun4i', 'spi/topic/topcliff-pch' and 'spi/topic/zynq' into spi-next