You need to sign in or sign up before continuing.
-
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux由 Anton Vorontsov 提交于
The merge is merely to fix conflicts before sending a pull request. Conflicts: drivers/power/ab8500_btemp.c drivers/power/ab8500_charger.c drivers/power/ab8500_fg.c drivers/power/abx500_chargalg.c drivers/power/max8925_power.c Signed-off-by: NAnton Vorontsov <anton.vorontsov@linaro.org>76d8a23b