tree 30b40b82f5f6d26982886a2aea5585cfdb4ac9ef
parent c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1
parent 0d2d0cc5216db678070efc911ef47f4cb53b4aad
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1367837330 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1367837330 +0100

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant