tree e2ad937216c513a545abbe4ccff0c57519b9c080
parent 51d0f6d1f50349579f007adf5c0b51aaedd93b94
parent bb910a7040e90a0ca3d3e8245d6d5c128a5d1287
author Linus Torvalds <torvalds@linux-foundation.org> 1268093429 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1268093429 -0800

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 Runtime: Make runtime PM of PCI devices inactive by default