From: Greg KH To: torvalds@osdl.org, akpm@osdl.org Cc: linux-kernel@vger.kernel.org Subject: [BK PATCH] PCI fixes for 2.6.7-rc1 Hi, Here are some small PCI patches for 2.6.7-rc1. They are a few pci id updates, janitor fixes, and a suspend bus fix patch. They have all been in the last few -mm releases. Please pull from: bk://kernel.bkbits.net/gregkh/linux/pci-2.6 thanks, greg k-h p.s. I'll send these as patches in response to this email to lkml for those who want to see them. drivers/pci/pci-driver.c | 26 ++++++++++++++++++++++++-- drivers/pci/pci.c | 5 +++++ drivers/pci/pci.ids | 26 +++++++++++++------------- drivers/pci/probe.c | 2 ++ include/linux/pci.h | 5 +++++ include/linux/pci_ids.h | 16 ++++++++++++++++ 6 files changed, 65 insertions(+), 15 deletions(-) ----- : o PCI: Add InfiniCon PCI ID to pci_ids.h Arjan van de Ven: o PCI: restore pci config space on resume Greg Kroah-Hartman: o Reversed pci.ids changes, as Linus already fixed them in his tree o PCI: fix up build warnings in pci.ids file Luiz Capitulino: o PCI: fix pci/probe.c possible NULL pointer Roland Dreier: o PCI: Add InfiniBand HCA IDs to pci_ids.h