]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 212ad2f 4949be1)
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)
commit0ae5eaf1032ca3cd5a0097f72992fc4821c762fa
tree9370e8fd969fa20fbb1b8e01f2095335f5787adetree | snapshot
parent212ad2f5f9287e019b61da5bb0409a6094161f5ccommit | diff
parent4949be16822e92a18ea0cc1616319926628092eecommit | 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
Linux kernel for KaRo TX COM modules