[git pull] PCI fixes

Jesse Barnes
2010-06-09T22:54:30Z

The following changes since commit
9dda696f0de87a2e5cfabb147e28c76b7d3c6846: Linus Torvalds (1):
Merge branch 'release' of
git://git.kernel.org/.../aegl/linux-2.6

are available in the git repository at:

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

Nothing too big here; I do have a couple of fixes in the queue that
aren't included here though. I'll be pulling them together over the
next couple of days.

Bjorn Helgaas (1):
PCI: change resource collision messages from KERN_ERR to KERN_INFO

Clemens Ladisch (1):
PCI quirk: AMD 780: work around wrong vendor ID on APC bridge

Dan Carpenter (1):
PCI: hotplug/shpchp_hpc: add parenthesis in SLOT_REG_RSVDZ_MASK

Linus Torvalds (1):
PCI aerdrv: fix annoying warnings

Stephen Hemminger (1):
PCI: sparse warning (trivial)

Tejun Heo (1):
PCI: disable MSI on VIA K8M800

drivers/pci/bus.c | 2 +-
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/pci/pcie/aer/aerdrv_core.c | 17 +++++++++--------
drivers/pci/quirks.c | 24 +++++++++++++++++++++---
drivers/pci/setup-res.c | 10 +++++-----
5 files changed, 37 insertions(+), 18 deletions(-)