From: Joerg Roedel Date: Mon, 21 Mar 2016 13:58:47 +0000 (+0100) Subject: Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70cf769c5ba283483a42c46f3734202b55dd3041;p=linux.git Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next --- 70cf769c5ba283483a42c46f3734202b55dd3041 diff --cc MAINTAINERS index 6ee06ea47be4d,30aca4aa5467b,27dac84dafe72,4978dc19a4d27,dbba65be4673e,dbba65be4673e,4978dc19a4d27,4978dc19a4d27..7430245857bd0 --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@@@@ -3449,8 -3445,9 -3442,9 -3442,9 -3444,9 -3444,9 -3442,9 -3442,9 +3451,8 @@@@@@@@@ S: Maintaine F: drivers/usb/dwc2/ DESIGNWARE USB3 DRD IP DRIVER - M: Felipe Balbi + M: Felipe Balbi L: linux-usb@vger.kernel.org -------L: linux-omap@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git S: Maintained F: drivers/usb/dwc3/ @@@@@@@@@ -7376,7 -7370,7 -7360,7 -7354,7 -7356,7 -7356,7 -7354,7 -7354,7 +7384,7 @@@@@@@@@ F: drivers/tty/isicom. F: include/linux/isicom.h MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER - M: Felipe Balbi ------M: Felipe Balbi +++++++M: Bin Liu L: linux-usb@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git S: Maintained @@@@@@@@@ -7956,9 -7939,11 -7929,11 -7923,11 -7925,11 -7925,11 -7923,11 -7923,11 +7964,9 @@@@@@@@@ F: drivers/media/platform/omap3isp F: drivers/staging/media/omap4iss/ OMAP USB SUPPORT - M: Felipe Balbi ------M: Felipe Balbi L: linux-usb@vger.kernel.org L: linux-omap@vger.kernel.org -------T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git -------S: Maintained +++++++S: Orphan F: drivers/usb/*/*omap* F: arch/arm/*omap*/usb*