diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-12 18:29:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-12 18:29:34 -0700 |
| commit | ac9dc67b730f3a1d10c5abbf91ed773d1e277646 (patch) | |
| tree | 5562c9a59adc4831dc8c0063c4ef38a19b9cb88c /net/mac80211/chan.c | |
| parent | 18f2af2d68815e1c4d5c275ebd030e27ef627582 (diff) | |
| parent | ac93ac7403493f8707b7734de9f40d5cb5db9045 (diff) | |
Merge tag 'pci-v3.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These are two important regression fixes for bugs we've introduced so
far in v3.14.
One of the resource allocation changes from the merge window is broken
for 32-bit kernels where we don't use _CRS for PCI host bridges
(mostly pre-2008 machines), so there's a fix for that.
The INTx enable change we put in after the merge window turned out to
break pciehp because we re-enable INTx on the hotplug bridge, which
apparently breaks MSI for future hotplug events"
* tag 'pci-v3.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Don't check resource_size() in pci_bus_alloc_resource()
PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
Diffstat (limited to 'net/mac80211/chan.c')
0 files changed, 0 insertions, 0 deletions