Merge branch 'master' of git://git.denx.de/u-boot-uniphier

diff --combined MAINTAINERS
index b709e96ef6d09d69b53ba4fb1384e9bca4e1dd82,5881b384997fa5d63452e7fed61623880bfee424..bdbd78d475977ad01f531e8c89a301e492339609
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -162,8 -162,7 +162,7 @@@ ARM UNIPHIE
  M:    Masahiro Yamada <yamada.m@jp.panasonic.com>
  S:    Maintained
  T:    git git://git.denx.de/u-boot-uniphier.git
- F:    arch/arm/cpu/armv7/uniphier/
- F:    arch/arm/include/asm/arch-uniphier/
+ F:    arch/arm/mach-uniphier/
  F:    configs/ph1_*_defconfig
  N:    uniphier
  
@@@ -209,7 -208,6 +208,7 @@@ M: Lukasz Majewski <l.majewski@samsung.
  S:    Maintained
  T:    git git://git.denx.de/u-boot-dfu.git
  F:    drivers/dfu/
 +F:    drivers/usb/gadget/
  
  DRIVER MODEL
  M:    Simon Glass <sjg@chromium.org>