summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-02 04:47:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-06-02 04:47:03 +0300
commite152813ff5fea74094ae296367f477411df1ba24 (patch)
tree6e8c38a3b83f0f07f75df50793332aa47a81c709 /MAINTAINERS
parent74db22cb3a16dcd782a31236eb139f5865804ae6 (diff)
parente18b7975c885bc3a938b9a76daf32957ea0235fa (diff)
downloadlinux-e152813ff5fea74094ae296367f477411df1ba24.tar.xz
Merge tag 'usb-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes: usb: patches for v4.2 merge window - dwc2 adds hibernation support - preparation for sunxi glue to musb driver - new ULPI bus - new ULPI PHY driver for TUSB1210 - musb patches to support multiple DMA engines on same binary - support for R-Car E2 on renesas_usbhs Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f8e0afb708b4..3b9d25f08cb5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10489,6 +10489,13 @@ S: Maintained
F: Documentation/video4linux/zr364xx.txt
F: drivers/media/usb/zr364xx/
+ULPI BUS
+M: Heikki Krogerus <heikki.krogerus@linux.intel.com>
+L: linux-usb@vger.kernel.org
+S: Maintained
+F: drivers/usb/common/ulpi.c
+F: include/linux/ulpi/
+
USER-MODE LINUX (UML)
M: Jeff Dike <jdike@addtoit.com>
M: Richard Weinberger <richard@nod.at>