diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 15:46:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 15:46:16 +0200 |
| commit | 6ca01a1b451de067462368bd9737efb7accb291c (patch) | |
| tree | 0ad34cabdd0b2ab580a993a6125319d2d840644f /MAINTAINERS | |
| parent | Merge tag 'usb-serial-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Linux 3.17-rc6 (diff) | |
| download | linux-6ca01a1b451de067462368bd9737efb7accb291c.tar.xz linux-6ca01a1b451de067462368bd9737efb7accb291c.zip | |
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-- | MAINTAINERS | 2 |
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 |