summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-04 11:02:16 +0000
committerMark Brown <broonie@kernel.org>2015-11-04 11:02:16 +0000
commitc70efb85153162295dc80099e95dab93d486a3ed (patch)
tree6752921839b268182d82dcda1dfaeeacfd1f52c3 /drivers
parent4c84518523f888994c618585021c76fa499d465e (diff)
parent88d4a7440e51754bd44f58fe1f8c6e6fe050e929 (diff)
parente6b5140b706689a38aaeabd9de8fb3e1531cf9cb (diff)
parentfc306de9b54e94a2949fee452741c00259d7dd4a (diff)
downloadlinux-stable-c70efb85153162295dc80099e95dab93d486a3ed.tar.gz
linux-stable-c70efb85153162295dc80099e95dab93d486a3ed.tar.bz2
linux-stable-c70efb85153162295dc80099e95dab93d486a3ed.zip
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next