• Linus Torvalds's avatar
    Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6 · e665faa4
    Linus Torvalds authored
    Pull battery updates from Anton Vorontsov:
     "1. New drivers:
         - Marvell 88pm860x charger and battery drivers;
         - Texas Instruments LP8788 charger driver;
      2. Two new power supply properties: whether a battery is authentic,
         and chargers' maximal currents and voltages;
      3. A lot of TI LP8727 Charger cleanups;
      4. New features for Charger Manager, mainly now we can disable
         specific regulators;
      5. Random fixes and cleanups for other drivers."
    
    Fix up trivial conflicts in <linux/mfd/88pm860x.h>
    
    * tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
      pda_power: Remove ac_draw_failed goto and label
      charger-manager: Add support sysfs entry for charger
      charger-manager: Support limit of maximum possible
      charger-manager: Check fully charged state of battery periodically
      lp8727_charger: More pure cosmetic improvements
      lp8727_charger: Fix checkpatch warning
      lp8727_charger: Add description in the private data
      lp8727_charger: Fix a typo - chg_parm to chg_param
      lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
      lp8727_charger: Clean up lp8727_charger_changed()
      lp8727_charger: Return if the battery is discharging
      lp8727_charger: Make lp8727_charger_get_propery() simpler
      lp8727_charger: Make lp8727_ctrl_switch() inline
      lp8727_charger: Make lp8727_init_device() shorter
      lp8727_charger: Clean up lp8727_is_charger_attached()
      lp8727_charger: Use specific definition
      lp8727_charger: Clean up lp8727 definitions
      lp8727_charger: Use the definition rather than enum
      lp8727_charger: Fix code for getting battery temp
      lp8727_charger: Clear interrrupts at inital time
      ...
    e665faa4
Makefile 2.26 KB