summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-11 23:09:31 +0100
committerMark Brown <broonie@kernel.org>2015-04-11 23:09:31 +0100
commit56afdb70ca9140cdcbdcf01870f3e4e2e8be17f5 (patch)
treeb2a88ff5dcd6fadd8caa8450712f10f98797860b /drivers
parent165f2288e1fc82df0c429942f2b7aef69de17d72 (diff)
parent956b200a846e324322f6211034c734c65a38e550 (diff)
parent30061915be6e3a2c2a4bc4f22a229d4eb7b7cc65 (diff)
downloadkernel-56afdb70ca9140cdcbdcf01870f3e4e2e8be17f5.tar.gz
Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/spidev-test' into spi-next