| commit | 0ae5eaf1032ca3cd5a0097f72992fc4821c762fa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 12 22:53:37 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 12 22:53:37 2012 -0700 |
| tree | 9370e8fd969fa20fbb1b8e01f2095335f5787ade | |
| parent | 212ad2f5f9287e019b61da5bb0409a6094161f5c [diff] | |
| parent | 4949be16822e92a18ea0cc1616319926628092ee [diff] |
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