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-Tag: Ubuntu-5.2.0-15.16~13055^2~5^4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7cad4c8f76869d2e689cb38e0181f1463e582352;p=mirror_ubuntu-eoan-kernel.git Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865 Conflicts: drivers/regulator/act8865-regulator.c --- 7cad4c8f76869d2e689cb38e0181f1463e582352