aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-22 06:46:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-22 06:46:16 -0700
commit6ca01a1b451de067462368bd9737efb7accb291c (patch)
tree0ad34cabdd0b2ab580a993a6125319d2d840644f /MAINTAINERS
parent93177d1f562e4c33871dcf8272e5f8686c73eff1 (diff)
parent0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff)
downloadlinux-6ca01a1b451de067462368bd9737efb7accb291c.tar.gz
Merge 3.17-rc6 into usb-next
We want the USB fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 294eef99277c..a41ffb508dda 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6878,7 +6878,7 @@ F: arch/x86/kernel/quirks.c
PCI DRIVER FOR IMX6
M: Richard Zhu <r65037@freescale.com>
-M: Shawn Guo <shawn.guo@freescale.com>
+M: Lucas Stach <l.stach@pengutronix.de>
L: linux-pci@vger.kernel.org
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained