diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-17 14:42:48 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-17 14:42:48 +0300 |
commit | bf1fc23c80e61695e8e899354d17549a4946a9d0 (patch) | |
tree | d2f4a544d3b96f7e576a7622e3cd75cc2bcfa51d /drivers/regulator/isl9305.c | |
parent | fa26e4d2b3cf1c84f20fbc003501bb028f682d92 (diff) | |
parent | 322dfa6402ec08da1ca182ac0061a1cf2c5c3101 (diff) | |
download | linux-bf1fc23c80e61695e8e899354d17549a4946a9d0.tar.xz |
Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-88pm800
Conflicts:
drivers/regulator/88pm800.c
Diffstat (limited to 'drivers/regulator/isl9305.c')
0 files changed, 0 insertions, 0 deletions