Merge branch 'spi-fix' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Mar 2013 19:11:47 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Mar 2013 19:11:47 +0000 (19:11 +0000)

Trivial merge