Linus Torvalds
f10a3a32ae
Revert "ACPI: battery: Convert discharge energy rate to current properly"
...
This reverts commit 558073dd56 , along with
the failed try to fix the regression it caused ("ACPI: Fix ACPI battery
regression introduced by commit 558073"), which just made things worse.
Commit aaad077638 (that failed "Fix ACPI
battery regression") got the voltage conversion confused, and fixed the
problem with Rafael's battery monitor apparently just by mistake.
So revert them both, getting us back to the 2.6.27 state in this, and
let's revisit it when people understand what's going on.
Noted-by: Paul Martin <pm@debian.org>
Requested-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <len.brown@intel.com>
Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-12-05 13:30:03 -08:00
..
dispatcher
events
Merge branch 'ec' into release
2008-11-11 21:17:26 -05:00
executer
hardware
namespace
parser
resources
sleep
ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume
2008-11-26 17:53:13 -05:00
tables
ACPI: use macro to replace hard number
2008-11-06 21:51:02 -05:00
utilities
ac.c
Merge branch 'sysfs' into release
2008-11-11 21:14:49 -05:00
acpi_memhotplug.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
asus_acpi.c
Merge branch 'ull' into test
2008-10-22 23:33:29 -04:00
battery.c
Revert "ACPI: battery: Convert discharge energy rate to current properly"
2008-12-05 13:30:03 -08:00
blacklist.c
ACPI: delete OSI(Linux) DMI dmesg spam
2008-11-27 01:55:21 -05:00
bus.c
ACPI: turn off all debug output by default
2008-11-07 21:45:16 -05:00
button.c
Merge branch 'ec' into release
2008-11-11 21:17:26 -05:00
cm_sbs.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
container.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
debug.c
ACPI: add driver component definitions to sysfs debug_layers
2008-11-07 21:45:04 -05:00
dock.c
Merge branch 'ull' into test
2008-10-22 23:33:29 -04:00
ec.c
ACPI: EC: count interrupts only if called from interrupt handler.
2008-11-26 17:16:45 -05:00
event.c
fan.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
glue.c
ACPI: video: Ignore devices that aren't present in hardware
2008-11-07 23:49:23 -05:00
Kconfig
ACPI: update debug parameter documentation
2008-11-07 21:45:29 -05:00
Makefile
Merge branch 'video' into release
2008-11-11 21:15:50 -05:00
numa.c
osl.c
ACPI: delete OSI(Linux) DMI dmesg spam
2008-11-27 01:55:21 -05:00
pci_bind.c
pci_irq.c
pci_link.c
ACPI: pci_link: remove acpi_irq_balance_set() interface
2008-11-11 21:12:05 -05:00
pci_root.c
ACPI: remove comments about debug layer/level to use
2008-11-06 15:30:19 -05:00
pci_slot.c
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-10-23 10:20:36 -07:00
power.c
Merge branch 'power' into release
2008-11-11 21:14:15 -05:00
processor_core.c
Merge branch 'processor-256' into release
2008-11-11 21:17:03 -05:00
processor_idle.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
processor_perflib.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
processor_thermal.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
processor_throttling.c
ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h
2008-11-07 21:44:37 -05:00
reboot.c
Revert "ACPI: Ingore the RESET_REG_SUP bit when using ACPI reset mechanism"
2008-11-06 20:51:59 -05:00
sbs.c
Merge branch 'linus' into test
2008-10-23 00:11:07 -04:00
sbshc.c
Merge branch 'ull' into test
2008-10-22 23:33:29 -04:00
sbshc.h
scan.c
Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used"
2008-11-26 17:55:15 -05:00
system.c
Merge branch 'ec' into release
2008-11-11 21:17:26 -05:00
tables.c
thermal.c
Merge branch 'sysfs' into release
2008-11-11 21:14:49 -05:00
toshiba_acpi.c
toshiba_acpi: close race in toshiba_acpi driver
2008-11-28 14:21:53 -05:00
utils.c
ACPI: scheduling in atomic via acpi_evaluate_integer ()
2008-11-26 17:39:06 -05:00
video.c
Merge branch 'video' into release
2008-11-11 21:15:50 -05:00
video_detect.c
Merge branch 'video' into release
2008-11-11 21:15:50 -05:00
wmi.c
ACPI: struct device - replace bus_id with dev_name(), dev_set_name()
2008-11-06 21:37:19 -05:00