summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-fsl-spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-03 19:33:39 +0400
committerMark Brown <broonie@kernel.org>2014-10-03 19:33:39 +0400
commit7020d7697178afbb3fe579edb99afb05211e4bf1 (patch)
treef4e89438e3de2abebe009f3a2f79c3e501c260ee /drivers/spi/spi-fsl-spi.c
parent1fc84503130927fae0b5e2f753f07a7192793223 (diff)
parent365a7bb32e097a8501a6a70b9225abcb09924f8c (diff)
parent2be01d29f8555d5afe0c7c4bea6b306b0c31f17f (diff)
parentf7477c2be8689ee8355db345f107744c9bd7f112 (diff)
parenta31083600476ac11b656bbc70784767f231469ff (diff)
downloadlinux-7020d7697178afbb3fe579edb99afb05211e4bf1.tar.xz
Merge remote-tracking branches 'spi/topic/davinci', 'spi/topic/doc', 'spi/topic/dw' and 'spi/topic/fsl' into spi-next