tree e840ceadcabbb939cbeb0a4bbec3ee0c1e2a4d3e
parent dd8c26f08e2880910448f314bb9dabd89f6ae4e1
parent ac8ed236a9765c8b0689ff97eaca071211d9e22b
author Mark Brown <broonie@linaro.org> 1382691083 +0100
committer Mark Brown <broonie@linaro.org> 1382691083 +0100

Merge remote-tracking branch 'spi/topic/butterfly' into spi-next