Merge branch 'spi-mcspi' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Nov 2012 03:16:50 +0000 (12:16 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Nov 2012 03:16:50 +0000 (12:16 +0900)

Trivial merge