Linus Torvalds
50fa86172b
Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6
Pull power supply and reset updates from Sebastian Reichel:
- Initial support for the following chips
* max77836 (charger)
* max14577 (charger)
* bq27742 (battery gauge)
* ltc2952 (poweroff)
* stih416 (restart)
* syscon-reboot (restart)
* gpio-restart (restart)
- cleanup of power supply core
- misc fixes in power supply and reset drivers
* tag 'for-v3.18' of git://git.infradead.org/battery-2.6: (48 commits)
power: ab8500_fg: Fix build warning
Documentation: charger: max14577: Update the date of introducing ABI
power: reset: corrections for simple syscon reboot driver
Documentation: power: reset: Add documentation for generic SYSCON reboot driver
power: reset: Add generic SYSCON register mapped reset
bq27x00_battery: Fix flag reading for bq27742
power: reset: use restart_notifier mechanism for msm-poweroff
power: Add simple gpio-restart driver
power: reset: st: Provide DT bindings for ST's Power Reset driver
power: reset: Add restart functionality for STiH41x platforms
power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge
power: max14577: Fix circular config SYSFS dependency
power: gpio-charger: do not use gpio value directly
power: max8925: Use of_get_child_by_name
power: max8925: Fix NULL ptr dereference on memory allocation failure
bq27x00_battery: Add support to bq27742
Documentation: charger: max14577: Document exported sysfs entry
devicetree: mfd: max14577: Add device tree bindings document
power: max17040: Add ID for MAX77836 Fuel Gauge block
charger: max14577: Configure battery-dependent settings from DTS and sysfs
...
Conflicts:
drivers/power/reset/Kconfig
drivers/power/reset/Makefile
2014-10-15 06:56:23 +02:00
..
2014-07-21 16:54:25 +01:00
2014-08-07 17:17:39 -07:00
2014-03-19 08:58:26 +00:00
2014-07-28 08:09:25 +01:00
2014-08-16 16:51:16 -05:00
2014-05-13 18:07:08 +05:30
2013-10-23 16:20:41 +01:00
2013-06-18 09:41:12 +02:00
2014-06-03 08:11:51 +01:00
2014-01-25 13:19:10 -08:00
2014-06-03 08:11:25 +01:00
2014-05-21 10:40:08 +01:00
2014-05-23 18:55:23 +01:00
2014-06-03 08:11:48 +01:00
2014-07-09 14:58:20 +01:00
2013-09-02 10:27:49 +02:00
2014-03-04 08:58:11 +08:00
2014-06-17 15:59:20 +01:00
2014-06-03 08:11:42 +01:00
2014-06-03 08:11:11 +01:00
2014-01-21 08:27:59 +00:00
2014-03-19 09:00:02 +00:00
2014-02-19 13:30:23 +00:00
2014-02-19 13:30:25 +00:00
2013-06-30 23:30:04 +02:00
2014-09-24 15:25:49 +01:00
2014-09-24 15:25:49 +01:00
2014-07-25 15:31:48 +01:00
2014-07-25 15:31:48 +01:00
2014-09-11 23:40:28 -07:00
2013-10-23 16:21:26 +01:00
2014-07-09 14:58:10 +01:00
2014-07-09 14:58:10 +01:00
2013-07-31 02:04:47 +02:00
2014-07-03 15:25:52 +01:00
2014-06-03 08:11:17 +01:00
2014-05-08 08:44:50 +01:00
2014-07-09 14:14:58 +01:00
2014-03-19 08:58:18 +00:00
2013-10-14 15:31:06 +02:00
2014-05-23 09:41:01 +01:00
2013-10-23 16:21:12 +01:00
2014-06-03 08:11:41 +01:00
2014-04-28 12:35:07 -07:00
2014-01-07 08:45:00 +00:00
2014-09-09 14:15:07 +02:00
2013-07-01 11:38:41 -07:00
2014-05-26 16:48:02 +01:00
2014-04-29 10:01:28 -07:00
2014-04-18 15:47:39 +01:00
2014-06-03 08:11:13 +01:00
2014-07-09 16:38:01 +01:00
2014-06-03 08:11:20 +01:00
2013-07-31 02:04:52 +02:00