summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-11 23:09:14 +0100
committerMark Brown <broonie@kernel.org>2015-04-11 23:09:14 +0100
commit35fbf8452ce6e7da4389d037a981c9d8d58dc1b7 (patch)
tree78b2553134ac3a94d6efd5b48c9f0928845a4e54 /drivers/spi/spi-imx.c
parent431959c0793e0d399303a061424dbaa1b33eb940 (diff)
parent7f43a87e06e2f19892ff3f278e0181cbf9901b15 (diff)
parent63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa (diff)
parente8361f70a85c3ecd8d5b971d4d8abcbb0f8586de (diff)
parent09355402325819675027eda25aba7026a325390c (diff)
downloadlinux-35fbf8452ce6e7da4389d037a981c9d8d58dc1b7.tar.bz2
Merge remote-tracking branches 'spi/topic/fsl-cspi', 'spi/topic/fsl-dspi', 'spi/topic/imx' and 'spi/topic/of-id' into spi-next