diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 18:56:44 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 18:56:44 +0100 |
commit | 99759619b27662d1290901228d77a293e6e83200 (patch) | |
tree | e76841fa3f59ebfc3975ff40bbc14363d0fdc5d3 /drivers/acpi/ec_sys.c | |
parent | Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
parent | PCI: label: remove #include of ACPI header to avoid warnings (diff) | |
download | linux-99759619b27662d1290901228d77a293e6e83200.tar.xz linux-99759619b27662d1290901228d77a293e6e83200.zip |
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: label: remove #include of ACPI header to avoid warnings
PCI: label: Fix compilation error when CONFIG_ACPI is unset
PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
PCI: introduce reset_resource()
PCI: data structure agnostic free list function
PCI: refactor io size calculation code
PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
PCI hotplug: acpiphp: set current_state to D0 in register_slot
PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
PCI: add more checking to ICH region quirks
PCI: aer-inject: Override PCIe AER Mask Registers
PCI: fix tlan build when CONFIG_PCI is not enabled
PCI: remove quirk for pre-production systems
PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
PCI: sysfs: Fix failure path for addition of "vpd" attribute
Diffstat (limited to 'drivers/acpi/ec_sys.c')
0 files changed, 0 insertions, 0 deletions