projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
John Crispins staging tree