summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-09 16:18:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-09 16:18:18 -0700
commit4f440cd534359f689cb577c68f8491d1eddf0b76 (patch)
tree3fd302d5c6facb7cdbac58854f82175dd8a8a83d /MAINTAINERS
parent191d385f253a317ed905b06137b48e5990e700cf (diff)
parentbf177a1eb6d106ba195de86734392d43dfbef702 (diff)
downloadop-kernel-dev-4f440cd534359f689cb577c68f8491d1eddf0b76.zip
op-kernel-dev-4f440cd534359f689cb577c68f8491d1eddf0b76.tar.gz
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--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5eb2398..c411c40 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
OpenPOWER on IntegriCloud