projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e5de3d a26d5ec)
Merge branch 'pci/joe-aspm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 2 Feb 2013 21:34:19 +0000 (14:34 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 2 Feb 2013 21:34:19 +0000 (14:34 -0700)
* pci/joe-aspm:
  PCI/ASPM: Don't touch ASPM if forcibly disabled
  PCI/ASPM: Deallocate upstream link state even if device is not PCIe


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git