From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Mar 2012 05:53:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
X-Git-Tag: v3.12-rc1~3711
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ae5eaf1032ca3cd5a0097f72992fc4821c762fa;p=kernel%2Fkernel-generic.git

Merge branch 'for-linus' of git://git./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
---

0ae5eaf1032ca3cd5a0097f72992fc4821c762fa