Merge remote-tracking branch 'spi/fix/atmel' into spi-linus
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 14:27:16 +0000 (18:27 +0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 May 2013 14:27:16 +0000 (18:27 +0400)

Trivial merge