From: Mark Brown Date: Tue, 5 Aug 2014 17:14:31 +0000 (+0100) Subject: Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cad4c8f76869d2e689cb38e0181f1463e582352;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865 Conflicts: drivers/regulator/act8865-regulator.c --- 7cad4c8f76869d2e689cb38e0181f1463e582352