tree f580c6d9c70389c7cc9cb5d659294e5077b0e412
parent 78040b630f28298e0ecb56bf1bc53c7976314eab
parent cd2d95d97c8d1b66467507400c63d707ddb1deba
author Mark Brown <broonie@sirena.org.uk> 1367111613 +0100
committer Mark Brown <broonie@sirena.org.uk> 1367111613 +0100

Merge remote-tracking branch 'regulator/fix/core' into v3.9-rc8