summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-06 12:58:46 +0000
committerMark Brown <broonie@kernel.org>2014-11-06 12:58:46 +0000
commit4e72b4278dbc228e4dc453d4dfeca997e521d9af (patch)
tree1dc67ebd3d5312671b7de0215b3bb23132fc4af9 /drivers
parent0df1f2487d2f0d04703f142813d53615d62a1da4 (diff)
parent5cc7b04740effa5cc0af53f434134b5859d58b73 (diff)
parent2b9375b91bef65b837bed61a05fb387159b38ddf (diff)
downloadlinux-4e72b4278dbc228e4dc453d4dfeca997e521d9af.tar.bz2
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus