Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 May 2013 10:48:50 +0000 (11:48 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 May 2013 10:48:50 +0000 (11:48 +0100)

Trivial merge