]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Mar 2012 05:53:37 +0000 (22:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Mar 2012 05:53:37 +0000 (22:53 -0700)
commite4a50e877493fe61adb90ec6fd68c75ff61ad9be
tree9370e8fd969fa20fbb1b8e01f2095335f5787ade
parent1f5d88e6fc44b9033a63ee4ed5bfead51a3aec66
parentd93943e9a8406966cc7aef10c27ac3fb542bcdae
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