diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 19:10:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 19:10:29 -0500 |
commit | 522dba7134d6b2e5821d3457f7941ec34f668e6d (patch) | |
tree | e2ad937216c513a545abbe4ccff0c57519b9c080 /drivers/pnp/pnpacpi/pnpacpi.h | |
parent | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 (diff) | |
parent | bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 (diff) |
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
Diffstat (limited to 'drivers/pnp/pnpacpi/pnpacpi.h')
0 files changed, 0 insertions, 0 deletions