Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io...

diff --cc MAINTAINERS
index 6ee06ea47be4d1cb2f865587f5e175e3f0235c32,30aca4aa5467b53d6a171a27b57a4357fa09127b,27dac84dafe72b4262d10b5eb60d669a41eaa59c,4978dc19a4d277fddb94b3118b5bb2f6e461a8b9,dbba65be4673e951e01a7045c92c2fb1a65d1605,dbba65be4673e951e01a7045c92c2fb1a65d1605,4978dc19a4d277fddb94b3118b5bb2f6e461a8b9,4978dc19a4d277fddb94b3118b5bb2f6e461a8b9..7430245857bd097d870f64f2c0467e9c4862c4d9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/MAINTAINERS
--- 8/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 <balbi@ti.com>
 +      M:      Felipe Balbi <balbi@kernel.org>
        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 <balbi@ti.com>
  ------M:      Felipe Balbi <balbi@kernel.org>
 +++++++M:      Bin Liu <b-liu@ti.com>
        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 <balbi@ti.com>
  ------M:      Felipe Balbi <balbi@kernel.org>
        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*
        

diff --cc drivers/iommu/Kconfig
Simple merge