Merge remote-tracking branches 'regulator/topic/axp20x', 'regulator/topic/da9211...
authorMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:23 +0000 (11:16 +0800)
committerMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:23 +0000 (11:16 +0800)

Trivial merge