Merge branches 'spi-drivers' and 'spi-mxs' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 28 Sep 2012 13:05:29 +0000 (14:05 +0100)

Trivial merge