git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eba3b67 1ebaf4f)
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)
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>

Trivial merge
Pandora Kernel Repository