Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Mar 2010 00:10:29 +0000 (16:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Mar 2010 00:10:29 +0000 (16:10 -0800)
commit522dba7134d6b2e5821d3457f7941ec34f668e6d
treee2ad937216c513a545abbe4ccff0c57519b9c080
parent51d0f6d1f50349579f007adf5c0b51aaedd93b94
parentbb910a7040e90a0ca3d3e8245d6d5c128a5d1287
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/PM Runtime: Make runtime PM of PCI devices inactive by default
drivers/pci/pci.c