tree 427bd77d51c6f150a0f7284696185028a8b9b0c1
parent 70324494b6f283311c5339fb1795fdec2d8850d9
parent 45e5033851acfbad1a69dea12caba3adbb162a0a
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1352276552 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1352276552 +0100

Merge branch 'spi-fix-s3c64xx' into spi-next