diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-02-24 07:59:38 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-02-24 07:59:38 +0100 |
| commit | e1cc4d31f889428a4ca73120951389c756404184 (patch) | |
| tree | 4a2028c750e19f5d36d0aa7545bda7cbacea9dd4 /MAINTAINERS | |
| parent | 23d184d2fbc805bdd9fb41f2370cdce04a7894af (diff) | |
| parent | 38dac81b3d0e777f301ca98100bfbcab01d616c2 (diff) | |
| download | u-boot-imx-e1cc4d31f889428a4ca73120951389c756404184.zip u-boot-imx-e1cc4d31f889428a4ca73120951389c756404184.tar.gz u-boot-imx-e1cc4d31f889428a4ca73120951389c756404184.tar.bz2 | |
Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1f77359..eef70d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -76,9 +76,7 @@ ARM ATMEL AT91 M: Andreas Bießmann <andreas.devel@googlemail.com> S: Maintained T: git git://git.denx.de/u-boot-atmel.git -F: arch/arm/cpu/armv7/at91/ -F: arch/arm/cpu/at91-common/ -F: arch/arm/include/asm/arch-at91/ +F: arch/arm/mach-at91/ ARM FREESCALE IMX M: Stefano Babic <sbabic@denx.de> @@ -100,8 +98,7 @@ M: Prafulla Wadaskar <prafulla@marvell.com> M: Luka Perkov <luka.perkov@sartura.hr> S: Maintained T: git git://git.denx.de/u-boot-marvell.git -F: arch/arm/cpu/arm926ejs/kirkwood/ -F: arch/arm/include/asm/arch-kirkwood/ +F: arch/arm/mach-kirkwood/ ARM MARVELL PXA M: Marek Vasut <marex@denx.de> @@ -147,9 +144,7 @@ ARM TEGRA M: Tom Warren <twarren@nvidia.com> S: Maintained T: git git://git.denx.de/u-boot-tegra.git -F: arch/arm/cpu/arm720t/tegra*/ -F: arch/arm/cpu/armv7/tegra*/ -F: arch/arm/cpu/tegra*/ +F: arch/arm/mach-tegra/ F: arch/arm/include/asm/arch-tegra*/ ARM TI @@ -170,7 +165,7 @@ 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 +N: uniphier ARM ZYNQ M: Michal Simek <monstr@monstr.eu> |