| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'battery' into release | Len Brown | 2011-08-05 | 1 | -3/+7 |
|\ |
|
| * | Battery: sysfs_remove_battery(): possible circular locking | Sergey Senozhatsky | 2011-08-05 | 1 | -3/+7 |
* | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... | Linus Torvalds | 2011-08-02 | 1 | -32/+50 |
|\ \ |
|
| | \ | |
| | \ | |
| *-. \ | Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from... | Len Brown | 2011-08-02 | 1 | -32/+50 |
| |\ \ \
| | | |/
| | |/| |
|
| | | * | ACPI: constify ops structs | Vasiliy Kulikov | 2011-07-16 | 1 | -1/+1 |
| | |/
| |/| |
|
| | * | ACPI / Battery: propagate sysfs error in acpi_battery_add() | Stefan Hajnoczi | 2011-07-16 | 1 | -3/+8 |
| | * | ACPI / Battery: avoid acpi_battery_add() use-after-free | Stefan Hajnoczi | 2011-07-16 | 1 | -6/+12 |
| | * | ACPI / Battery: Resolve the race condition in the sysfs_remove_battery() | Lan Tianyu | 2011-07-14 | 1 | -1/+6 |
| | * | ACPI / Battery: Add the check before refresh sysfs in the battery_notify() | Lan Tianyu | 2011-07-14 | 1 | -2/+4 |
| | * | ACPI / Battery: Add the hibernation process in the battery_notify() | Lan Tianyu | 2011-07-14 | 1 | -0/+1 |
| | * | ACPI / Battery: Rename acpi_battery_quirks2 with acpi_battery_quirks | Lan Tianyu | 2011-07-14 | 1 | -2/+2 |
| | * | ACPI / Battery: Change 16-bit signed negative battery current into correct value | Lan Tianyu | 2011-07-14 | 1 | -16/+10 |
| | * | ACPI / Battery: Add the power unit macro | Lan Tianyu | 2011-07-14 | 1 | -3/+8 |
| |/ |
|
* / | treewide: fix potentially dangerous trailing ';' in #defined values/expressions | Phil Carmody | 2011-07-21 | 1 | -1/+1 |
|/ |
|
* | ACPI battery: fribble sysfs files from a resume notifier | Kyle McMartin | 2011-03-22 | 1 | -0/+22 |
* | ACPI / Battery: remove battery refresh on resume | Linus Torvalds | 2011-01-20 | 1 | -1/+0 |
* | ACPI / Battery: Update information on info notification and resume | Rafael J. Wysocki | 2011-01-12 | 1 | -0/+14 |
* | ACPI: delete CONFIG_ACPI_PROCFS_POWER and power procfs I/F in 2.6.39 | Zhang Rui | 2011-01-12 | 1 | -0/+2 |
* | Merge branch 'battery' into release | Len Brown | 2010-10-25 | 1 | -8/+27 |
|\ |
|
| * | ACPI / Battery: Return -ENODEV for unknown values in get_property() | Rafael J. Wysocki | 2010-10-23 | 1 | -8/+27 |
* | | ACPI battery: support percentage battery remaining capacity | Zhang Rui | 2010-10-22 | 1 | -1/+37 |
* | | ACPI ac/battery/sbs: sysfs I/F always built in, procfs I/F disabled by default | Zhang Rui | 2010-10-15 | 1 | -21/+0 |
|/ |
|
* | ACPI: Don't report current_now if battery reports in mWh | Matthew Garrett | 2010-08-31 | 1 | -1/+0 |
* | ACPI battery: don't invoke power_supply_changed twice when battery is hot-added | Zhang Rui | 2010-07-06 | 1 | -1/+7 |
*-. | Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480... | Len Brown | 2010-04-06 | 1 | -0/+1 |
|\ \ |
|
| | * | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp... | Tejun Heo | 2010-03-30 | 1 | -0/+1 |
| |/ |
|
* | | ACPI: battery drivers should call power_supply_changed() | Alan Jenkins | 2010-04-04 | 1 | -1/+1 |
* | | ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n | Alan Jenkins | 2010-04-04 | 1 | -2/+2 |
|/ |
|
*-. | Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzill... | Len Brown | 2010-03-14 | 1 | -2/+2 |
|\ \ |
|
| | * | ACPI: replace acpi_integer by u64 | Lin Ming | 2010-01-28 | 1 | -2/+2 |
| |/ |
|
* | | ACPI: Battery: Add support for _BIX extended info method | Alexey Starikovskiy | 2010-01-15 | 1 | -10/+58 |
* | | ACPI: Battery: Add bit flags | Alexey Starikovskiy | 2010-01-15 | 1 | -12/+14 |
|/ |
|
* | battery: fix typo in comment | Justin P. Mattock | 2009-12-16 | 1 | -1/+1 |
* | Merge branch 'battery' into release | Len Brown | 2009-09-19 | 1 | -0/+20 |
|\ |
|
| * | ACPI battery: work around negative s16 battery current on Acer | Hector Martin | 2009-08-29 | 1 | -0/+20 |
* | | ACPI: Move definition of PREFIX from acpi_bus.h to internal..h | Len Brown | 2009-08-28 | 1 | -0/+2 |
|/ |
|
* | ACPI: battery: fix CONFIG_ACPI_PROCFS_POWER=n build warning | Len Brown | 2009-06-18 | 1 | -7/+5 |
* | ACPI: battery: use .notify method instead of installing handler directly | Bjorn Helgaas | 2009-06-18 | 1 | -17/+5 |
* | Revert "ACPI battery: fix async boot oops" | Linus Torvalds | 2009-04-11 | 1 | -1/+1 |
* | ACPI battery: fix async boot oops | Vegard Nossum | 2009-04-07 | 1 | -1/+1 |
* | Merge branch 'linus' into release | Len Brown | 2009-04-05 | 1 | -1/+0 |
|\ |
|
| * | proc 2/2: remove struct proc_dir_entry::owner | Alexey Dobriyan | 2009-03-31 | 1 | -1/+0 |
* | | Merge branch 'constify' into release | Len Brown | 2009-04-05 | 1 | -1/+1 |
|\ \ |
|
| * | | ACPI: constify VFTs (1/2) | Jan Engelhardt | 2009-04-03 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'async-battery' into release | Len Brown | 2009-04-05 | 1 | -4/+11 |
|\ \ |
|
| * | | ACPI: battery: asynchronous init | Arjan van de Ven | 2009-04-04 | 1 | -4/+11 |
| |/ |
|
* / | ACPI: battery: add power_{now,avg} properties to power_class | Alexey Starikovskiy | 2009-03-27 | 1 | -5/+7 |
|/ |
|
* | battery: don't assume we are fully charged when not charging or discharging | Richard Hughes | 2009-02-21 | 1 | -1/+24 |
* | Newly inserted battery might differ from one just removed, so | Alexey Starikovskiy | 2008-12-22 | 1 | -2/+3 |
* | Revert "ACPI: battery: Convert discharge energy rate to current properly" | Linus Torvalds | 2008-12-05 | 1 | -13/+1 |