Merge branch 'spi-linus' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Nov 2012 09:03:29 +0000 (10:03 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Nov 2012 09:03:29 +0000 (10:03 +0100)
1  2 
drivers/spi/spi-omap2-mcspi.c

Simple merge