]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/for-next'
authorMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 20:47:55 +0000 (21:47 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 17 Oct 2013 20:47:55 +0000 (21:47 +0100)
commit599400c5bc67f1ccb3198dc288ea65a0e49bb392
tree6853819297815ab4fa9911465386f528f16a222b
parenta66c48d642e0a450b3bc41ba0d81ed0f19e2c842
parent96e5ac06a6991e205520a64973509336af9e865f
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