From: Anton Vorontsov Date: Wed, 12 Dec 2012 06:15:57 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~20^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76d8a23b127020472207b281427d3e9f4f1227e4;p=pandora-kernel.git Merge git://git./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 --- 76d8a23b127020472207b281427d3e9f4f1227e4 Reading git-diff-tree failed