summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-20 16:42:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-20 16:42:41 -0700
commit9160338de92c0305329be5163a76f849806e83de (patch)
treea71f6574679a1abd994b62673d04beee2b1c3414 /kernel
parent3b31fe92948439161bc44c11e22e0e474543b5a2 (diff)
parent0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4 (diff)
downloadop-kernel-dev-9160338de92c0305329be5163a76f849806e83de.zip
op-kernel-dev-9160338de92c0305329be5163a76f849806e83de.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: "Here are two patches from Rafael Wysocki. One fixes an EHCI-related hibernation crash on ASUS boxes. We fixed a similar suspend issue in v3.6-rc1, and this applies the same fix to the hibernate path. The other fixes D3/D3cold/D4 messages related to the D3cold support we merged in v3.6-rc1." (Removed redundant top non-fast-forward merge commit from pulled branch) * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: EHCI: Fix crash during hibernation on ASUS computers PCI / PM: Fix D3/D3cold/D4 messages printed by acpi_pci_set_power_state()
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud