]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pci/rafael-3.6-fixes' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2012 18:10:39 +0000 (12:10 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2012 18:10:39 +0000 (12:10 -0600)
* pci/rafael-3.6-fixes:
  PCI: EHCI: Fix crash during hibernation on ASUS computers
  PCI / PM: Fix D3/D3cold/D4 messages printed by acpi_pci_set_power_state()


Trivial merge