diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 21:33:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-09 21:33:53 +0100 |
| commit | 63d4ec8731865b228065e212f01661023f85b972 (patch) | |
| tree | 412774978f6d5780310dc5fbaadea80a6b3a2082 /include/net/xfrm.h | |
| parent | a4275153cc77b726b9a0595d56e216158a4c4167 (diff) | |
| parent | ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc (diff) | |
Merge tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Power management:
- PCI/PM: Fix proc config reg access for D3cold and bridge
suspending
- PCI/PM: Resume device before shutdown
- PCI/PM: Fix deadlock when unbinding device if parent in D3cold
Hotplug:
- PCI/portdrv: Don't create hotplug slots unless port supports
hotplug"
* tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/portdrv: Don't create hotplug slots unless port supports hotplug
PCI/PM: Fix proc config reg access for D3cold and bridge suspending
PCI/PM: Resume device before shutdown
PCI/PM: Fix deadlock when unbinding device if parent in D3cold
Diffstat (limited to 'include/net/xfrm.h')
0 files changed, 0 insertions, 0 deletions