Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Jun 2006 22:28:04 +0000 (15:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Jun 2006 22:28:04 +0000 (15:28 -0700)
commitdc4967e756021f318d125c9f4fa98b958ae9f2de
tree05f6a50d69356ead5e988b214ab5f664389010bd
parentc0bbbc73d58f1b774cd987b5687a478a027f137c
parent8b8c8d280ab2d18fe6e42d671f60d4ffed451cdc
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  [PATCH] PCI: reverse pci config space restore order
  [PATCH] PCI: Improve PCI config space writeback
  [PATCH] PCI: Error handling on PCI device resume
  [PATCH] PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled