]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/for-next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 17:09:02 +0000 (18:09 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 17:09:02 +0000 (18:09 +0100)
commit1aa6f8e31458115fb241fb72b201ea733514a8d8
treedd4fd7622f2e8f4b910839a73e5575b6ccec66ff
parent307f59e7584e08d8a10f63257935b51f44aa3631
parentdae703852293748430b1793b8f8c425baaa72a4a
Merge remote-tracking branch 'spi/for-next'

Conflicts:
drivers/spi/spi.c
Documentation/driver-model/devres.txt
drivers/spi/spi-fsl-cpm.c
drivers/spi/spi-fsl-espi.c
drivers/spi/spi-mpc512x-psc.c
drivers/spi/spi.c