]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
authorMark Brown <broonie@linaro.org>
Thu, 29 Aug 2013 12:59:05 +0000 (13:59 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 29 Aug 2013 12:59:05 +0000 (13:59 +0100)
commitf65ad73b196f7e42c3d8c4555294c056a228f6d4
tree6db5fb34a2d590086e25f7f682fecb5f43e6b283
parent0192017747f019fbebb1f49d9e3a06ff9d93b89d
parent3506219cc21073af6fc743d72944a7578df9e13c
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Conflicts:
drivers/spi/spi-rspi.c
drivers/spi/spi-altera.c
drivers/spi/spi-nuc900.c
drivers/spi/spi-rspi.c
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-xilinx.c