From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Sep 2012 00:15:49 +0000 (-0700)
Subject: Merge tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
X-Git-Tag: v3.6-rc5~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8b9cf0f319af81f617606bdc90a4984ae3b3ca2;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge tag '3.6-pci-fixes' of git://git./linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:
 "Power management
    - PCI/PM: Enable D3/D3cold by default for most devices
    - PCI/PM: Keep parent bridge active when probing device
    - PCI/PM: Fix config reg access for D3cold and bridge suspending
    - PCI/PM: Add ABI document for sysfs file d3cold_allowed
  Core
    - PCI: Don't print anything while decoding is disabled"

* tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Don't print anything while decoding is disabled
  PCI/PM: Add ABI document for sysfs file d3cold_allowed
  PCI/PM: Fix config reg access for D3cold and bridge suspending
  PCI/PM: Keep parent bridge active when probing device
  PCI/PM: Enable D3/D3cold by default for most devices
---

f8b9cf0f319af81f617606bdc90a4984ae3b3ca2