Skip to contentSkip to conversation

PCI fixes

GIT PULL Jesse Barnes 1 participant 1 message Apr 23, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30: Linus Torvalds (1):

        Merge git://git.kernel.org/.../davem/ide-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

A few more fixes for the new resource management code, and a couple of misc. fixes from Alexander and Matthew.

Alexander Duyck (1):
PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset

Bjorn Helgaas (3):
x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions
PCI: revert broken device warning
x86/PCI: parse additional host bridge window resource types

Matthew Garrett (1):
PCI: Ensure we re-enable devices on resume

 arch/x86/pci/acpi.c           |   42 +++++++++++++++++++++++++++++++++++-----
 drivers/pci/pci.c             |    6 +----
 drivers/pci/pcie/aer/aerdrv.c |   10 +++++++-
 drivers/pci/probe.c           |   23 ++++++---------------
 4 files changed, 52 insertions(+), 29 deletions(-)

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center