commit | ee4629f5b2f3dda7c83fa816068a67073abb55d9 | [log] [tgz] |
---|---|---|
author | Mark Brown <broonie@kernel.org> | Wed Dec 24 12:57:54 2014 +0000 |
committer | Mark Brown <broonie@kernel.org> | Wed Dec 24 12:57:54 2014 +0000 |
tree | 341e0c232286acc9d10743bb3ee5da32ef3d6e59 | |
parent | 76fe5e95fac3c93bdff9102480e5ba823ba656c3 [diff] | |
parent | 015760563ec77bf17cec712fa94afdf53b285287 [diff] |
Merge remote-tracking branches 'spi/fix/img-spfi' and 'spi/fix/msiof' into spi-linus