tree 57d76cf7a495ea8f1ac662e12442bf6164ea3024
parent e2b6d02cca533715d6be40fdfc32d3cc47333358
parent b49bfd32901625e4adcfee011d2b32a43b4db67d
author Linus Torvalds <torvalds@linux-foundation.org> 1262987739 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262987739 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCIe AER: prevent AER injection if hardware masks error reporting
  PCI/PM: Use per-device D3 delays
  PCI: Check the node argument passed to cpumask_of_node
  PCI: AER: fix aer inject result in kernel oops
  PCI: pcie portdrv: style cleanup