tree 5a318c2b60ba6e7861d630310d1930f62b8893ce
parent 73b5301b02c8d3456a5ea64c9ed9802a4a376af6
parent e47a682ace0cd56eb8e09b806c2b0f034b491520
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1352192609 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1352192609 +0100

Merge branch 'spi-linus' into spi-next