Len Brown 57599cc997 Merge branch 'bjorn-notify' into release ...

Conflicts:
	drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>

2009-06-24 01:22:20 -04:00

..

acpica

ACPICA: Disable preservation of SCI enable bit (SCI_EN)

2009-05-27 00:41:34 -04:00

ac.c

ACPI: ac: use .notify method instead of installing handler directly

2009-06-18 00:13:14 -04:00

acpi_memhotplug.c

…

battery.c

ACPI: battery: fix CONFIG_ACPI_PROCFS_POWER=n build warning

2009-06-18 00:38:27 -04:00

blacklist.c

ACPI: DMI to disable Vista compatibility on some Sony laptops

2009-06-23 23:32:47 -04:00

bus.c

ACPI: use handle, not device, in system notification path

2009-06-18 00:13:15 -04:00

button.c

…

cm_sbs.c

…

container.c

…

debug.c

…

dock.c

…

ec.c

…

event.c

…

fan.c

…

glue.c

ACPI: kill acpi_get_physical_pci_device()

2009-06-17 23:32:24 -04:00

internal.h

…

Kconfig

PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS

2009-06-18 13:57:24 -07:00

Makefile

…

numa.c

…

osl.c

ACPI: fix a deadlock in hotplug case

2009-06-23 23:23:14 -04:00

pci_bind.c

ACPI: kill acpi_get_pci_id

2009-06-17 23:32:23 -04:00

pci_irq.c

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

2009-06-24 01:19:50 -04:00

pci_link.c

…

pci_root.c

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

2009-06-24 01:19:50 -04:00

pci_slot.c

…

power.c

ACPI: don't check power state after _ON/_OFF

2009-05-27 21:45:53 -04:00

proc.c

…

processor_core.c

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

2009-06-24 01:19:50 -04:00

processor_idle.c

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

2009-06-24 01:19:50 -04:00

processor_perflib.c

ACPI: sanity check _PSS frequency to prevent cpufreq crash

2009-05-29 20:45:58 -04:00

processor_thermal.c

…

processor_throttling.c

ACPI processor: remove spurious newline from warning message

2009-05-29 21:26:26 -04:00

reboot.c

…

sbs.c

…

sbshc.c

…

sbshc.h

…

scan.c

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

2009-06-24 01:19:50 -04:00

sleep.c

…

sleep.h

…

system.c

…

tables.c

…

thermal.c

…

utils.c

…

video_detect.c

ACPI: video: convert to acpi_get_pci_dev

2009-06-17 23:32:23 -04:00

video.c

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release

2009-06-24 01:19:50 -04:00

wakeup.c

…