]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:17:00 +0000 (12:17 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:17:00 +0000 (12:17 +0100)
commit462410006452282a85055abdc2c56427002a63ff
tree182eb140d5c71501159fb0d46ffc8b74c766dc13
parentf3f28ba38d7379558796727dc39e79e42410b48e
parent84c004a4c956a405ef313cf98e91202610e57135
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers

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