]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorAnton Vorontsov <anton.vorontsov@linaro.org>
Wed, 12 Dec 2012 06:15:57 +0000 (22:15 -0800)
committerAnton Vorontsov <anton.vorontsov@linaro.org>
Wed, 12 Dec 2012 06:15:57 +0000 (22:15 -0800)
commit1de310b68755878fa8a9cc98995f27bbe300af68
treee14d7063d96d850fb259115d6fb08cbeb98ccf88
parenta7f4d289fff55fde76e7f3b4cbc1e64f68da80cf
parentc4463f136c0efd794aa080f5f1e4ced894af0904
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

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>
drivers/mfd/ab8500-core.c
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/bq27x00_battery.c
drivers/power/generic-adc-battery.c
drivers/power/jz4740-battery.c
drivers/power/lp8788-charger.c
drivers/power/max17042_battery.c
drivers/power/max8925_power.c