summaryrefslogtreecommitdiff
path: root/include/linux/i2o.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 07:01:43 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 07:01:43 +0300
commit5aafdea448fb86412a6f8e46df518c1545d32436 (patch)
treec8e7b57382628873a26b15fbda1f41b527ad1c0b /include/linux/i2o.h
parent56a9ccb7ba5ffd5f285e3a9628cb446192c8639c (diff)
parenteca67315e0e0d5fd91264d79c88694006dbc7d31 (diff)
downloadlinux-5aafdea448fb86412a6f8e46df518c1545d32436.tar.xz
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
Diffstat (limited to 'include/linux/i2o.h')
0 files changed, 0 insertions, 0 deletions