From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2011 04:01:43 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v6.6-pxa1908~31178
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5aafdea448fb86412a6f8e46df518c1545d32436;p=linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: Disable ASPM when _OSC control is not granted for PCIe services
  PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs
  PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
  PCI/ACPI: Report ASPM support to BIOS if not disabled from command line
---

5aafdea448fb86412a6f8e46df518c1545d32436