[git pull] PCI fixes

Jesse Barnes
2010-01-07T22:34:46Z

The following changes since commit 2c1f1895ef2aa8f0e5497893eff71304aef332e1:
Linus Torvalds (1):
Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-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 misc fixes since the last request, including a fix from Rafael to allow
devices to resume more reliably (namely those that need extra time to come
back from D3).

David John (1):
PCI: Check the node argument passed to cpumask_of_node

Hidetoshi Seto (1):
PCI: pcie portdrv: style cleanup

Rafael J. Wysocki (1):
PCI/PM: Use per-device D3 delays

Youquan,Song (2):
PCI: AER: fix aer inject result in kernel oops
PCIe AER: prevent AER injection if hardware masks error reporting

drivers/net/sky2.c | 1 +
drivers/pci/pci-sysfs.c | 6 ++++--
drivers/pci/pci.c | 19 +++++++++++++++----
drivers/pci/pcie/aer/aer_inject.c | 28 ++++++++++++++++++++++++++--
drivers/pci/pcie/portdrv_core.c | 16 +++++++---------
drivers/pci/pcie/portdrv_pci.c | 17 ++++++++---------
include/linux/pci.h | 1 +
7 files changed, 62 insertions(+), 26 deletions(-)