diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 20:15:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 20:15:49 -0400 |
| commit | f8b9cf0f319af81f617606bdc90a4984ae3b3ca2 (patch) | |
| tree | fb79ca2400b523b88e56a03a5ea98ea4a6a12db8 /drivers/pcmcia/yenta_socket.c | |
| parent | eeea3ac912207dcf759b95b2b4c36f96bce583bf (diff) | |
| parent | 0ff9514b579b4f2f3e6038cd961ce64c224c3c73 (diff) | |
Merge tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas:
"Power management
- PCI/PM: Enable D3/D3cold by default for most devices
- PCI/PM: Keep parent bridge active when probing device
- PCI/PM: Fix config reg access for D3cold and bridge suspending
- PCI/PM: Add ABI document for sysfs file d3cold_allowed
Core
- PCI: Don't print anything while decoding is disabled"
* tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Don't print anything while decoding is disabled
PCI/PM: Add ABI document for sysfs file d3cold_allowed
PCI/PM: Fix config reg access for D3cold and bridge suspending
PCI/PM: Keep parent bridge active when probing device
PCI/PM: Enable D3/D3cold by default for most devices
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
0 files changed, 0 insertions, 0 deletions