76d8a23b12
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: Anton Vorontsov <anton.vorontsov@linaro.org> |
||
---|---|---|
.. | ||
bootp | ||
compressed | ||
dts | ||
.gitignore | ||
install.sh | ||
Makefile |