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)
commit3086c9f6482101b3c06935cdfb4d4b56adb60097
tree30b40b82f5f6d26982886a2aea5585cfdb4ac9ef
parentc1be5a5b1b355d40e6cf79cc979eb66dafa24ad1
parent0d2d0cc5216db678070efc911ef47f4cb53b4aad
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant