]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'spi/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:37:45 +0000 (11:37 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:37:45 +0000 (11:37 +0200)
commit8d74d6c02976bc0bae6f7a5f6524289e1b7f7383
treee37bf69c17d18e7cd78491ebced0fab41116c352
parent31040dbe1aeb98d965489a108552c777892b6a80
parentf8ce25620cdce9bb71072c5480591607f8e828ac
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