Merge tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
authorLinus Torvalds <[email protected]>
Fri, 5 Jun 2015 17:22:06 +0000 (10:22 -0700)
committerLinus Torvalds <[email protected]>
Fri, 5 Jun 2015 17:22:06 +0000 (10:22 -0700)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
index a5b8584da5bf6b85806b636365f2022f9eff6023,72674ba8cca5aac658e707dd83c77474b96ab759..d8afd29536786b0907c795afeb8cd5aa3ff2d3b6
@@@ -7574,7 -7546,8 +7574,8 @@@ S:      Maintaine
  F:    drivers/pci/host/pci-exynos.c
  
  PCI DRIVER FOR SYNOPSIS DESIGNWARE
 -M:    Jingoo Han <[email protected]>
 +M:    Jingoo Han <[email protected]>
+ M:    Pratyush Anand <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/pci/host/*designware*