]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99
tree9f2923e577ca25a38eb7e0bb9cdb9d762c9b809e
parentbfa21a0dfe6915dc85953b5d40ea9dae5fdf205f
parent39138818a4f5c62d70f35504477c2509f982f211
Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-dt-cb

Conflicts:
drivers/regulator/core.c
drivers/regulator/core.c