Linus Torvalds 5aafdea448 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: Disable ASPM when _OSC control is not granted for PCIe services
  PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs
  PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
  PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

2011-03-25 21:01:43 -07:00

..

acpica

Merge branch 'reset' into release

2011-03-23 02:34:15 -04:00

apei

Merge branch 'linus' into release

2011-03-23 02:34:54 -04:00

ac.c

Merge branch 'procfs-cleanup' into release

2011-01-12 05:00:07 -05:00

acpi_ipmi.c

IPMI/ACPI: Add the IPMI opregion driver to enable ACPI to access BMC controller

2010-12-14 00:22:14 -05:00

acpi_memhotplug.c

…

acpi_pad.c

ACPI: minor printk format change in acpi_pad

2011-03-23 01:36:45 -04:00

atomicio.c

…

battery.c

ACPI battery: fribble sysfs files from a resume notifier

2011-03-22 23:30:31 -04:00

blacklist.c

…

bus.c

PM: Drop pm_flags that is not necessary

2011-03-15 00:43:16 +01:00

button.c

ACPI button: remove unused procfs I/F

2011-03-22 23:20:35 -04:00

cm_sbs.c

…

container.c

…

debugfs.c

ACPI / debugfs: Fix buffer overflows, double free

2011-02-24 19:59:06 +01:00

dock.c

ACPICA: Rename some function and variable names

2011-01-12 04:24:40 -05:00

ec_sys.c

ACPI: Remove the unused EC sysdev class

2011-03-18 18:22:20 -04:00

ec.c

ACPICA: Implicit notify support

2011-01-12 04:27:00 -05:00

event.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

fan.c

ACPI / Fan: Rework the handling of power resources

2011-01-12 04:48:45 -05:00

glue.c

ACPI / PM: Drop special ACPI wakeup flags

2011-01-07 01:18:00 -05:00

hed.c

…

internal.h

ACPI: Remove the unused EC sysdev class

2011-03-18 18:22:20 -04:00

Kconfig

PM / ACPI: Remove references to pm_flags from bus.c

2011-03-15 00:43:15 +01:00

Makefile

Merge branch 'ipmi' into release

2011-01-12 05:03:13 -05:00

numa.c

x86-64, NUMA: Unify {acpi|amd}_{numa_init|scan_nodes}() arguments and return values

2011-02-16 12:13:06 +01:00

nvs.c

ACPI / PM: Use existing ACPI iomaps for NVS save/restore (v2)

2011-02-24 19:58:42 +01:00

osl.c

Merge branch 'linus' into release

2011-03-23 02:34:54 -04:00

pci_bind.c

…

pci_irq.c

ACPI: remove unused declaration of proc_fs.h

2010-10-15 22:03:36 -04:00

pci_link.c

ACPI: Use syscore_ops instead of sysdev class and sysdev

2011-03-18 18:22:21 -04:00

pci_root.c

PCI: Disable ASPM when _OSC control is not granted for PCIe services

2011-03-21 09:41:08 -07:00

pci_slot.c

…

power_meter.c

…

power.c

ACPI / PM: Check status of power resources under mutexes

2011-01-12 05:05:39 -05:00

proc.c

ACPI / PM: Use device wakeup flags for handling ACPI wakeup devices

2011-01-07 01:17:41 -05:00

processor_core.c

ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree

2011-03-02 20:58:20 -05:00

processor_driver.c

ACPI: use __init where possible in processor driver

2011-03-02 20:56:53 -05:00

processor_idle.c

Merge branch 'linus' into idle-test

2011-01-12 18:06:06 -05:00

processor_perflib.c

…

processor_thermal.c

ACPI thermal: remove two unused functions

2010-12-11 02:01:47 -05:00

processor_throttling.c

Merge branch 'throttling' into release

2011-01-12 05:01:08 -05:00

reboot.c

ACPI: Make sure the FADT is at least rev 2 before using the reset register

2011-03-22 23:52:49 -04:00

sbs.c

ACPI: delete CONFIG_ACPI_PROCFS_POWER and power procfs I/F in 2.6.39

2011-01-12 00:36:17 -05:00

sbshc.c

…

sbshc.h

…

scan.c

ACPI: Remove the wakeup.run_wake_count device field

2011-02-24 19:58:53 +01:00

sleep.c

Merge branch 'linus' into release

2011-03-23 02:34:54 -04:00

sleep.h

ACPI: static sleep_states[] and acpi_gts_bfs_check

2010-10-19 13:44:37 -04:00

sysfs.c

ACPICA: Global event handler

2011-01-12 04:27:00 -05:00

tables.c

…

thermal.c

ACPI / Fan: Rework the handling of power resources

2011-01-12 04:48:45 -05:00

utils.c

…

video_detect.c

ACPI / Video: Probe for output switch method when searching video devices.

2011-02-12 01:40:16 +01:00

video.c

acpi: tie ACPI backlight devices to PCI devices if possible

2011-03-22 17:44:00 -07:00

wakeup.c

ACPI / Wakeup: Enable button GPEs unconditionally during initialization

2011-02-12 01:39:53 +01:00