tree 3199753118adf26baf52841cb913afa77f549829
parent f5d6eba74b8aac7d4bf646c5445807aa6a247e6c
parent c0eb46766d395da8d62148bda2e59bad5e6ee2f2
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1331730753 +0000
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1331730753 +0000

Merge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/devm' into regmap-next