diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-05 10:22:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-05 10:22:06 -0700 |
commit | 456fdb267377b88fa37abf60fcbd9bfaa813bf1f (patch) | |
tree | e61e262e78e0dfe3ccd6cd4589c9361d116796c1 /drivers/char/pcmcia | |
parent | 6e6f9e0b00f9ecfa816b290e08d5e660c3f1aae5 (diff) | |
parent | 552bc94ebeeb189d0ac682dae95cf05e6b72d7fd (diff) | |
download | linux-456fdb267377b88fa37abf60fcbd9bfaa813bf1f.tar.gz linux-456fdb267377b88fa37abf60fcbd9bfaa813bf1f.tar.bz2 linux-456fdb267377b88fa37abf60fcbd9bfaa813bf1f.zip |
Merge tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Resource management
- Fix IOV sorting by alignment (Wei Yang)
- Preserve resource size during alignment reordering (Yinghai Lu)
Miscellaneous
- MAINTAINERS: Add Pratyush for SPEAr13xx and DesignWare PCIe (Pratyush Anand)"
* tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Preserve resource size during alignment reordering
PCI: Fix IOV resource sorting by alignment requirement
MAINTAINERS: Add Pratyush Anand as SPEAr13xx and DesignWare PCIe maintainer
Diffstat (limited to 'drivers/char/pcmcia')
0 files changed, 0 insertions, 0 deletions