Merge branches 'spi-core' and 'spi-tegra' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Nov 2012 16:47:00 +0000 (16:47 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Nov 2012 16:47:00 +0000 (16:47 +0000)
1  2  3 
drivers/spi/spi.c

Simple merge