diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-24 18:46:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-24 18:46:29 +0200 |
| commit | 2d7ed01e5bda639bdbca5507e06c34f46348b681 (patch) | |
| tree | ef207eec5dd2d8ff4046948b51b16ba9a256672e /drivers/pcmcia/pxa2xx_mainstone.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | PCI: pciehp: Fix pcie_wait_cmd() timeout (diff) | |
| download | linux-2d7ed01e5bda639bdbca5507e06c34f46348b681.tar.xz linux-2d7ed01e5bda639bdbca5507e06c34f46348b681.zip | |
Merge tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Here are a few fixes that should be in v3.17.
- Reverting "Don't scan random busses" covers up a CardBus regression
having to do with allocating CardBus bus numbers.
- Reverting "Make sure bus numbers stay within parents bounds" covers
up an ACPI _CRS bug that makes us reconfigure a bridge, causing a
broken device behind it to stop responding.
- The pciehp timeout change fixes some code we added in v3.17.
Without the fix, we can send a new hotplug command too early,
before the timeout has expired.
I hope for better fixes for the reverts, but those will have to come
after v3.17"
* tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: pciehp: Fix pcie_wait_cmd() timeout
Revert "PCI: Make sure bus number resources stay within their parents bounds"
Revert "PCI: Don't scan random busses in pci_scan_bridge()"
Diffstat (limited to 'drivers/pcmcia/pxa2xx_mainstone.c')
0 files changed, 0 insertions, 0 deletions