diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 01:42:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 01:42:41 +0200 |
| commit | 9160338de92c0305329be5163a76f849806e83de (patch) | |
| tree | a71f6574679a1abd994b62673d04beee2b1c3414 /block/partitions/sun.c | |
| parent | Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | PCI: EHCI: Fix crash during hibernation on ASUS computers (diff) | |
| download | linux-9160338de92c0305329be5163a76f849806e83de.tar.xz linux-9160338de92c0305329be5163a76f849806e83de.zip | |
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 'block/partitions/sun.c')
0 files changed, 0 insertions, 0 deletions