From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 13 Jul 2006 04:17:41 +0000 (-0700)
Subject: Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD
X-Git-Tag: v2.6.18-rc2~96
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3745f46e32d86de188cf378f923b7a2ed5274f9;p=linux-2.6-omap-h63xx.git

Merge commit master.kernel.org:/pub/scm/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()
---

d3745f46e32d86de188cf378f923b7a2ed5274f9