diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-03 00:12:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-03 00:12:52 +0400 |
| commit | aa8032b6facc18c91e8798f4475a8b5a82a2f87d (patch) | |
| tree | 136622f44c665fd96d54f8082d8c3aff445d625f /drivers/net/wireless/hostap/hostap.h | |
| parent | 1fe0135b9e135ecef4eb2144027a74c3de6bf874 (diff) | |
| parent | 36dd1f3e02a4aed850a7b7318d7abd4f4d50528c (diff) | |
| download | linux-aa8032b6facc18c91e8798f4475a8b5a82a2f87d.tar.xz | |
Merge tag 'pci-v3.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Yinghai fixed a couple regressions: one resource assignment problem
introduced in v3.10 that showed up with SR-IOV on powerpc, and another
SR-IOV hot-remove issue related to refcounting changes we merged for
v3.11.
Yinghai is still working on another SR-IOV-related fix or two, which
will be simpler if pciehp is non-modular, so I included the Kconfig
changes now to get them in earlier.
Finally, a minor fix for the ARM Marvell EBU host bridge driver that
was merged for v3.11
Hotplug:
PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device
PCI: hotplug: Convert to be builtin only, not modular
PCI: pciehp: Convert pciehp to be builtin only, not modular
Resource allocation:
PCI: Retry allocation of only the resource type that failed
ARM:
PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge"
* tag 'pci-v3.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge
PCI: Retry allocation of only the resource type that failed
PCI: pciehp: Convert pciehp to be builtin only, not modular
PCI: hotplug: Convert to be builtin only, not modular
PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device
Diffstat (limited to 'drivers/net/wireless/hostap/hostap.h')
0 files changed, 0 insertions, 0 deletions