]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'spi-drivers' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Aug 2012 21:59:45 +0000 (22:59 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 17 Aug 2012 21:59:45 +0000 (22:59 +0100)
commit4209ddd126f01abb48e1b00f5b678432fe91f31d
tree0d3c7d6da8c7c93e4730eaaeb57d40852d949902
parentd52cd6c369197366960760087cd483843c6c4b15
parenta8e8f1398e80335b923fe747eab2b7c40d14ae31
Merge branch 'spi-drivers' into spi-next

Conflicts:
drivers/spi/spi-omap2-mcspi.c
drivers/spi/spi-omap2-mcspi.c