From: Linus Torvalds Date: Fri, 5 Jun 2015 17:22:06 +0000 (-0700) Subject: Merge tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=456fdb267377b88fa37abf60fcbd9bfaa813bf1f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'pci-v4.1-fixes-2' of git://git./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 --- 456fdb267377b88fa37abf60fcbd9bfaa813bf1f diff --cc MAINTAINERS index a5b8584da5bf,72674ba8cca5..d8afd2953678 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7574,7 -7546,8 +7574,8 @@@ S: Maintaine F: drivers/pci/host/pci-exynos.c PCI DRIVER FOR SYNOPSIS DESIGNWARE -M: Jingoo Han +M: Jingoo Han + M: Pratyush Anand L: linux-pci@vger.kernel.org S: Maintained F: drivers/pci/host/*designware*