summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-mxs.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-03 16:33:41 +0100
committerMark Brown <broonie@kernel.org>2014-10-03 16:33:41 +0100
commit899d81b974ec7b3fd0f875c578bd91e89212742f (patch)
tree9b7336f576cf94da09a5a17fed1999dd8a79a7cc /drivers/spi/spi-mxs.c
parent7020d7697178afbb3fe579edb99afb05211e4bf1 (diff)
parent90f90bbb6049db243289f31800e750b2ce160322 (diff)
parentf62caccd12c17e4cb516d43a6e4dd8a3abc1f7e0 (diff)
parenta44619c31c203257fe9704e41c714f35d9990018 (diff)
parent9f5b8b4f56dd194fd33021810636879036d2acdd (diff)
parentdf59fa7f4bca9658b75f0f5fee225b3a057475c5 (diff)
Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic/mxs', 'spi/topic/omap-100k' and 'spi/topic/orion' into spi-next