]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:14:26 +0000 (12:14 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:14:26 +0000 (12:14 +0100)
commitf3f28ba38d7379558796727dc39e79e42410b48e
tree30f11b3581cdab9f344bd6718a73988e7fc6a59c
parent79f19820a2b261419d175b10f742c86a4baac615
parent1bfd8fd71460d478799ad495ec40d692db5c2729
Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers

Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Kconfig
drivers/regulator/Makefile