Merge branch 'spi-fix' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Apr 2013 13:55:16 +0000 (14:55 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 1 Apr 2013 13:55:16 +0000 (14:55 +0100)
1  2 
drivers/spi/spi-s3c64xx.c
drivers/spi/spi.c

Simple merge
Simple merge