Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 15:33:41 +0000 (16:33 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 15:33:41 +0000 (16:33 +0100)
commit899d81b974ec7b3fd0f875c578bd91e89212742f
tree9b7336f576cf94da09a5a17fed1999dd8a79a7cc
parent7020d7697178afbb3fe579edb99afb05211e4bf1
parent90f90bbb6049db243289f31800e750b2ce160322
parentf62caccd12c17e4cb516d43a6e4dd8a3abc1f7e0
parenta44619c31c203257fe9704e41c714f35d9990018
parent9f5b8b4f56dd194fd33021810636879036d2acdd
parentdf59fa7f4bca9658b75f0f5fee225b3a057475c5
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
drivers/base/regmap/regmap.c
drivers/spi/spi-fsl-dspi.c
drivers/spi/spi-mxs.c
drivers/spi/spi-orion.c