Anton Vorontsov
76d8a23b12
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>
2012-12-11 22:15:57 -08:00
2012-11-28 12:22:27 -08:00
2012-07-16 15:00:32 +02:00
2012-09-29 01:25:28 +02:00
2012-11-28 12:22:27 -08:00
2012-07-16 14:31:59 +02:00
2012-09-17 15:24:31 +02:00
2012-07-09 00:16:10 +02:00
2012-08-22 19:00:37 +01:00
2012-11-28 12:20:19 -08:00
2012-10-07 17:29:24 +09:00
2012-09-14 09:52:15 +02:00
2012-11-18 19:37:18 -08:00
2012-09-15 23:22:04 +02:00
2012-10-29 11:05:12 -07:00
2012-10-29 11:05:12 -07:00
2012-08-09 15:16:41 +02:00
2012-09-23 20:51:34 +02:00
2012-11-17 20:44:44 -08:00
2012-09-14 09:52:13 +02:00
2012-09-19 12:07:56 +02:00
2012-09-19 12:39:13 +02:00
2012-07-09 00:16:13 +02:00
2012-07-09 00:16:13 +02:00
2012-09-01 10:01:31 -07:00
2012-07-09 00:16:14 +02:00
2012-08-28 11:00:25 -07:00
2012-07-09 00:16:07 +02:00
2012-10-23 16:32:16 +09:00
2012-09-23 20:51:29 +02:00
2012-10-06 03:05:03 +09:00
2012-11-15 17:30:14 -08:00
2012-11-15 17:30:14 -08:00
2012-10-01 15:27:48 +02:00
2012-09-17 15:24:14 +02:00
2012-09-17 15:03:38 +02:00
2012-07-21 00:02:18 -04:00
2012-10-05 12:01:30 +09:00
2012-09-25 10:42:02 +02:00
2012-10-06 03:09:16 +09:00
2012-10-05 12:01:30 +09:00
76d8a23b12