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/PM: Do not use native PCIe PME by default
This commit is contained in:
Linus Torvalds 2010-06-27 07:41:04 -07:00
commit dee70a32fa
2 changed files with 16 additions and 7 deletions