summaryrefslogtreecommitdiffstats
path: root/drivers/power
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpcLinus Torvalds2012-08-021-0/+1
|\
| * drivers: OLPC: update various drivers to include olpc-ec.hAndres Salomon2012-07-311-0/+1
* | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-311-5/+1
|\ \
| * | pda_power: remove IRQF_SAMPLE_RANDOM which is now a no-opTheodore Ts'o2012-07-191-5/+1
* | | Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6Linus Torvalds2012-07-3115-50/+691
|\ \ \ | |_|/ |/| |
| * | Merge with upstream to accommodate with thermal changesAnton Vorontsov2012-07-311-1/+1
| |\|
| * | olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteriesRichard A. Smith2012-07-161-4/+2
| * | olpc-battery: Add VOLTAGE_MAX_DESIGN propertyRichard A. Smith2012-07-161-0/+56
| * | charger-manager: Fix build break related to EXTCONChanwoo Choi2012-07-151-0/+1
| * | lp8727_charger: Move header file into platform_data directoryKim, Milo2012-07-141-1/+1
| * | power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENTRamakrishna Pallala2012-07-131-0/+6
| * | bq27x00_battery: Add support for BQ27425 chipSaranya Gopal2012-07-131-15/+69
| * | charger-manager: Set current limit of regulator for over current protectionChanwoo Choi2012-07-131-0/+15
| * | charger-manager: Use EXTCON Subsystem to detect charger cables for chargingChanwoo Choi2012-07-131-16/+121
| * | test_power: Add VOLTAGE_NOW and BATTERY_TEMP propertiesDmitry Eremin-Solenikov2012-06-201-0/+31
| * | test_power: Add support for USB AC sourceDmitry Eremin-Solenikov2012-06-201-2/+46
| * | gpio-charger: Use cansleep version of gpio_set_valuePritesh Raithatha2012-06-191-1/+1
| * | bq27x00_battery: Add support for power average and health propertiesSyed Rafiuddin2012-06-191-0/+71
| * | sbs-battery: Don't trigger false supply_changed eventNikolaus Voss2012-06-191-1/+1
| * | twl4030_charger: Allow charger to control the regulator that feeds itNeilBrown2012-06-191-0/+15
| * | twl4030_charger: Add backup-battery chargingNeilBrown2012-06-191-0/+59
| * | twl4030_charger: Fix some typosNeilBrown2012-06-191-3/+3
| * | max17042_battery: Support CHARGE_COUNTER power supply attributeRamakrishna Pallala2012-06-191-0/+8
| * | smb347-charger: Add constant charge and current propertiesRamakrishna Pallala2012-06-191-6/+117
| * | power_supply: Add constant charge_current and charge_voltage propertiesRamakrishna Pallala2012-06-191-0/+2
| * | power_supply: Register battery as a thermal zoneJenny TC2012-06-171-0/+65
| * | ds2781_battery: w1_ds2781_read() should be staticAnton Vorontsov2012-06-171-1/+1
| * | pda_power: Complain if regulator operations failMark Brown2012-06-171-2/+2
| |/
* | Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-07-262-21/+2
|\ \
| * | W1: split master mutex to avoid deadlocks.NeilBrown2012-06-132-21/+2
| |/
* | Merge tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-07-264-25/+26
|\ \
| * | usb: phy: fix return value check of usb_get_phyKishon Vijay Abraham I2012-07-024-13/+14
| * | usb: otg: support for multiple transceivers by a single controllerKishon Vijay Abraham I2012-06-254-4/+4
| * | usb: otg: utils: rename function name in OTG utilsKishon Vijay Abraham I2012-06-254-12/+12
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-07-241-1/+1
|\ \
| * \ Merge branch 'master' into for-nextJiri Kosina2012-06-291-8/+13
| |\ \
| * | | ab8500-btemp: Fix typo 'AB5500'Paul Bolle2012-06-281-1/+1
* | | | ARM: OMAP2+: do not allow SmartReflex to be built as a moduleJean Pihet2012-06-291-1/+1
* | | | Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kerne...Tony Lindgren2012-06-265-0/+1142
|\ \ \ \ | |_|_|/ |/| | |
| * | | ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/Jean Pihet2012-05-315-0/+1142
* | | | Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6Linus Torvalds2012-05-3111-485/+839
|\ \ \ \ | |_|_|/ |/| | |
| * | | smb347-charger: Include missing <linux/err.h>Mika Westerberg2012-05-181-0/+1
| * | | smb347-charger: Clean up battery attributesRamakrishna Pallala2012-05-061-49/+0
| * | | max17042_battery: Add support for max17047/50 chipRamakrishna Pallala2012-05-052-13/+61
| * | | sbs-battery.c: Capacity attr = remaining relative capacityNikolaus Voss2012-05-051-1/+1
| * | | isp1704_charger: Use after free on probe errorDan Carpenter2012-05-051-1/+1
| * | | ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZEAxel Lin2012-05-051-14/+6
| * | | power_supply: Fix a typo in BATTERY_DS2781 Kconfig entryAxel Lin2012-05-051-1/+1
| * | | charger-manager: Provide cm_notify_event function for in-kernel useChanwoo Choi2012-05-051-0/+163
| * | | charger-manager: Poll battery health in normal stateChanwoo Choi2012-05-051-0/+229