]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85a00dd db288c9)
Merge branch 'pci/rafael-pci_set_power_state-rebase' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 5 Jul 2012 22:29:52 +0000 (16:29 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 5 Jul 2012 22:29:52 +0000 (16:29 -0600)
* pci/rafael-pci_set_power_state-rebase:
  PCI / PM: restore the original behavior of pci_set_power_state()

1  2 
drivers/pci/pci.c patch | diff1 | diff2 | blob | history
drivers/pci/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
Linux kernel for KaRo TX COM modules