diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-09 16:18:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-09 16:18:18 -0700 |
| commit | 4f440cd534359f689cb577c68f8491d1eddf0b76 (patch) | |
| tree | 3fd302d5c6facb7cdbac58854f82175dd8a8a83d /MAINTAINERS | |
| parent | 191d385f253a317ed905b06137b48e5990e700cf (diff) | |
| parent | bf177a1eb6d106ba195de86734392d43dfbef702 (diff) | |
Merge tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Just a fix for the device reset path and an email address update.
Virtualization
- Fix "wait for pending transactions" for PCI AF reset (Alex
Williamson)
Miscellaneous
- Update mx6 PCI driver maintainer email (Fabio Estevam)"
* tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
MAINTAINERS: Update mx6 PCI driver maintainer's email
PCI: Fix unaligned access in AF transaction pending test
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5eb2398a7fa..c411c40d885 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6787,7 +6787,7 @@ F: arch/x86/kernel/quirks.c PCI DRIVER FOR IMX6 M: Richard Zhu <r65037@freescale.com> -M: Shawn Guo <shawn.guo@linaro.org> +M: Shawn Guo <shawn.guo@freescale.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained |