tree 9370e8fd969fa20fbb1b8e01f2095335f5787ade
parent 212ad2f5f9287e019b61da5bb0409a6094161f5c
parent 4949be16822e92a18ea0cc1616319926628092ee
author Linus Torvalds <torvalds@linux-foundation.org> 1331618017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331618017 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

Pull PCI changes from Jesse Barnes:
 "A single fix for a regression that affects some people who try to
  disable ASPM for whatever reason."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled