git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 56a9ccb eca6731)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 04:01:43 +0000 (21:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Mar 2011 04:01:43 +0000 (21:01 -0700)
commit5aafdea448fb86412a6f8e46df518c1545d32436
treec8e7b57382628873a26b15fbda1f41b527ad1c0btree
parent56a9ccb7ba5ffd5f285e3a9628cb446192c8639ccommit | diff
parenteca67315e0e0d5fd91264d79c88694006dbc7d31commit | diff
Merge branch 'for-linus' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.