commit | 3086c9f6482101b3c06935cdfb4d4b56adb60097 | [log] [tgz] |
---|---|---|
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon May 06 11:48:50 2013 +0100 |
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon May 06 11:48:50 2013 +0100 |
tree | 30b40b82f5f6d26982886a2aea5585cfdb4ac9ef | |
parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 [diff] | |
parent | 0d2d0cc5216db678070efc911ef47f4cb53b4aad [diff] |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant