From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 11 Jun 2006 22:28:04 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: Ubuntu-5.2.0-15.16~50781
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dc4967e756021f318d125c9f4fa98b958ae9f2de;p=mirror_ubuntu-eoan-kernel.git

Merge master.kernel.org:/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
---

dc4967e756021f318d125c9f4fa98b958ae9f2de