Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 9 Jan 2015 18:03:55 +0000 (18:03 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 9 Jan 2015 18:03:55 +0000 (18:03 +0000)
Conflicts:
drivers/regulator/core.c


Trivial merge