Linus Torvalds 50fa86172b power supply and reset changes for the v3.18 series ... - 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJUOWD7AAoJENju1/PIO/qaj5QP/AtbG96NRpX6Ou8W+qulhSbe npTKItRMERZhV+lJUAdmLxQq8Cy6I5Cobdj140oIM6HIKZ7Dh6jChxd2t+RCLsO0 Y16VMq45L9E/mQuVCLqSSNCPKrRjbF7hW+8gpym/Yc846o3Fv8nhTQzkWxCsVrDR rNerRnrUyvKpqRpCN88u4ZuOHjm/146nZtTsAzvL8nGnQBZFJHv4eu7D5nwSN0QS FrLiI/mE7h1KFcdK5LrZf51IfEP9w4RVV3vs1wEuP0iPS5dguv2dNzXXVZa5eD/2 AYSSouVKkgdwryLAvIIaDLD405UYl5Xgt5J6d+QKXxm2+eeZMEY36+PEK5WtRtBX CykzO2BgvxyOdz2HU9D8irR1Li71jVSWwQITMJ6bQsbKEQAhltmkmsTOxtqB+ekd 254rKcKWTqllmEhg1LR8PCidf8OZNEcKzXi4XmQdQIcKNF9tvdTXP5c0/FzuIAlQ tqWZW1kQK6/TTfx+XxeeszJWY5VknIaka2Bi83pOZYtu94CtUFBdEVkpaYmC433+ qLOto7VMy+AKYViTJJDDEnSEFiLNZz/zF+SUDf+YB1RelULSF3zC8CbDcZQa5fNm 4qTU1fl2gGrIZ1jDPPihm6xP8r9WkeuQWEytG2UJZoa+l4XmzfLHBUUDVo0zqTd3 txfmKca8Y3GhXGwINi1m =sj9S -----END PGP SIGNATURE----- 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
..
powercap	PowerCap: Documentation	2013-10-17 00:36:06 +02:00
regulator	regulator: Proofread documentation	2014-08-27 22:04:36 +01:00
00-INDEX	Documentation/: update 00-INDEX files	2014-02-10 16:01:40 -08:00
apm-acpi.txt
basic-pm-debugging.txt	Documentation/: update FireWire debugging documentation	2014-01-12 18:54:38 +01:00
charger-manager.txt	Documentation: Charger Manager: Fix spelling mistakes	2014-09-16 11:01:27 +02:00
devices.txt	PM / sleep: Update device PM documentation to cover direct_complete	2014-05-16 23:15:44 +02:00
drivers-testing.txt	PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt	2010-12-24 15:02:41 +01:00
freezing-of-tasks.txt	suspend: enable freeze timeout configuration through sys	2013-02-09 22:32:48 +01:00
interface.txt	PM: Documentation update for freeze state	2013-05-14 01:41:37 +02:00
notifiers.txt	PM / hibernate: Correct documentation	2013-05-14 01:58:43 +02:00
opp.txt	PM / OPP: Remove ARCH_HAS_OPP	2014-07-23 00:51:30 +02:00
pci.txt
pm_qos_interface.txt	PM / QoS: Add type to dev_pm_qos_add_ancestor_request() arguments	2014-02-11 00:36:00 +01:00
power_supply_class.txt	power_supply: Add boot and calibration attributes	2014-09-06 21:05:04 +02:00
runtime_pm.txt	Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'	2014-06-03 23:13:00 +02:00
s2ram.txt
states.txt	PM / sleep: Introduce command line argument for sleep state enumeration	2014-05-26 13:40:59 +02:00
suspend-and-cpuhotplug.txt	PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt	2014-06-09 22:54:15 +02:00
suspend-and-interrupts.txt	PM / genirq: Document rules related to system suspend and interrupts	2014-09-01 14:14:17 +02:00
swsusp-and-swap-files.txt
swsusp-dmcrypt.txt
swsusp.txt	PM / hibernate: Documentation: Fix script for unswapping	2014-05-07 01:51:16 +02:00
tricks.txt
userland-swsusp.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
video.txt