]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:14:31 +0000 (18:14 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:14:31 +0000 (18:14 +0100)
Conflicts:
drivers/regulator/act8865-regulator.c


Trivial merge