Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 04:17:41 +0000 (21:17 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Jul 2006 04:17:41 +0000 (21:17 -0700)
commitd3745f46e32d86de188cf378f923b7a2ed5274f9
treeb6ad64cbd41644de503a15ce3669e00ec602db8f
parent70d002bccac5e107fafb95e83fcb7fc010a88695
parentffadcc2ff42ecedf71ea67d9051ff028927aed08
Merge commit /linux/kernel/git/gregkh/pci-2.6 of HEAD

* HEAD:
  [PATCH] PCI: PCIE power management quirk
  [PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
  [PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
  [PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()