tree e14d7063d96d850fb259115d6fb08cbeb98ccf88
parent eba3b670a9166a91be5a11fe33290dca6b9457a2
parent 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf
author Anton Vorontsov <anton.vorontsov@linaro.org> 1355292957 -0800
committer Anton Vorontsov <anton.vorontsov@linaro.org> 1355292957 -0800

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>