Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
authorMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 16:40:06 +0000 (17:40 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 16:40:06 +0000 (17:40 +0100)

Trivial merge