diff options
| author | Tom Rini <trini@ti.com> | 2014-10-07 07:38:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-07 07:38:39 -0400 |
| commit | dd0204e48d05f41480743a798b94d5484b664639 (patch) | |
| tree | 0dada741b0dc5b60dcc63ae0dfe783b6935e7eba /MAINTAINERS | |
| parent | 742de9076e8a8f44b77794b43e6175d86b897996 (diff) | |
| parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
| download | u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.zip u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.tar.gz u-boot-imx-dd0204e48d05f41480743a798b94d5484b664639.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index af194ca..aafa061 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -149,6 +149,15 @@ F: arch/arm/include/asm/arch-davinci/ F: arch/arm/include/asm/arch-omap*/ F: arch/arm/include/asm/ti-common/ +ARM UNIPHIER +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: configs/ph1_*_defconfig +F: drivers/serial/serial_uniphier.c + ARM ZYNQ M: Michal Simek <monstr@monstr.eu> S: Maintained |