summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/battery.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'battery' into releaseLen Brown2011-08-051-3/+7
|\
| * Battery: sysfs_remove_battery(): possible circular lockingSergey Senozhatsky2011-08-051-3/+7
* | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2011-08-021-32/+50
|\ \
| | \
| | \
| *-. \ Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from...Len Brown2011-08-021-32/+50
| |\ \ \ | | | |/ | | |/|
| | | * ACPI: constify ops structsVasiliy Kulikov2011-07-161-1/+1
| | |/ | |/|
| | * ACPI / Battery: propagate sysfs error in acpi_battery_add()Stefan Hajnoczi2011-07-161-3/+8
| | * ACPI / Battery: avoid acpi_battery_add() use-after-freeStefan Hajnoczi2011-07-161-6/+12
| | * ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()Lan Tianyu2011-07-141-1/+6
| | * ACPI / Battery: Add the check before refresh sysfs in the battery_notify()Lan Tianyu2011-07-141-2/+4
| | * ACPI / Battery: Add the hibernation process in the battery_notify()Lan Tianyu2011-07-141-0/+1
| | * ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirksLan Tianyu2011-07-141-2/+2
| | * ACPI / Battery: Change 16-bit signed negative battery current into correct valueLan Tianyu2011-07-141-16/+10
| | * ACPI / Battery: Add the power unit macroLan Tianyu2011-07-141-3/+8
| |/
* / treewide: fix potentially dangerous trailing ';' in #defined values/expressionsPhil Carmody2011-07-211-1/+1
|/
* ACPI battery: fribble sysfs files from a resume notifierKyle McMartin2011-03-221-0/+22
* ACPI / Battery: remove battery refresh on resumeLinus Torvalds2011-01-201-1/+0
* ACPI / Battery: Update information on info notification and resumeRafael J. Wysocki2011-01-121-0/+14
* ACPI: delete CONFIG_ACPI_PROCFS_POWER and power procfs I/F in 2.6.39Zhang Rui2011-01-121-0/+2
* Merge branch 'battery' into releaseLen Brown2010-10-251-8/+27
|\
| * ACPI / Battery: Return -ENODEV for unknown values in get_property()Rafael J. Wysocki2010-10-231-8/+27
* | ACPI battery: support percentage battery remaining capacityZhang Rui2010-10-221-1/+37
* | ACPI ac/battery/sbs: sysfs I/F always built in, procfs I/F disabled by defaultZhang Rui2010-10-151-21/+0
|/
* ACPI: Don't report current_now if battery reports in mWhMatthew Garrett2010-08-311-1/+0
* ACPI battery: don't invoke power_supply_changed twice when battery is hot-addedZhang Rui2010-07-061-1/+7
*-. Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480...Len Brown2010-04-061-0/+1
|\ \
| | * include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-301-0/+1
| |/
* | ACPI: battery drivers should call power_supply_changed()Alan Jenkins2010-04-041-1/+1
* | ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=nAlan Jenkins2010-04-041-2/+2
|/
*-. Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzill...Len Brown2010-03-141-2/+2
|\ \
| | * ACPI: replace acpi_integer by u64Lin Ming2010-01-281-2/+2
| |/
* | ACPI: Battery: Add support for _BIX extended info methodAlexey Starikovskiy2010-01-151-10/+58
* | ACPI: Battery: Add bit flagsAlexey Starikovskiy2010-01-151-12/+14
|/
* battery: fix typo in commentJustin P. Mattock2009-12-161-1/+1
* Merge branch 'battery' into releaseLen Brown2009-09-191-0/+20
|\
| * ACPI battery: work around negative s16 battery current on AcerHector Martin2009-08-291-0/+20
* | ACPI: Move definition of PREFIX from acpi_bus.h to internal..hLen Brown2009-08-281-0/+2
|/
* ACPI: battery: fix CONFIG_ACPI_PROCFS_POWER=n build warningLen Brown2009-06-181-7/+5
* ACPI: battery: use .notify method instead of installing handler directlyBjorn Helgaas2009-06-181-17/+5
* Revert "ACPI battery: fix async boot oops"Linus Torvalds2009-04-111-1/+1
* ACPI battery: fix async boot oopsVegard Nossum2009-04-071-1/+1
* Merge branch 'linus' into releaseLen Brown2009-04-051-1/+0
|\
| * proc 2/2: remove struct proc_dir_entry::ownerAlexey Dobriyan2009-03-311-1/+0
* | Merge branch 'constify' into releaseLen Brown2009-04-051-1/+1
|\ \
| * | ACPI: constify VFTs (1/2)Jan Engelhardt2009-04-031-1/+1
| |/
* | Merge branch 'async-battery' into releaseLen Brown2009-04-051-4/+11
|\ \
| * | ACPI: battery: asynchronous initArjan van de Ven2009-04-041-4/+11
| |/
* / ACPI: battery: add power_{now,avg} properties to power_classAlexey Starikovskiy2009-03-271-5/+7
|/
* battery: don't assume we are fully charged when not charging or dischargingRichard Hughes2009-02-211-1/+24
* Newly inserted battery might differ from one just removed, soAlexey Starikovskiy2008-12-221-2/+3
* Revert "ACPI: battery: Convert discharge energy rate to current properly"Linus Torvalds2008-12-051-13/+1