diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-14 00:03:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-14 00:03:06 -0400 |
| commit | 216800acf1fbf9f498455bf3c92d4513d9a4c681 (patch) | |
| tree | 08ee65c9c73a954c71b6f6051725338f0f23fdcb /MAINTAINERS | |
| parent | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (diff) | |
| parent | 59aea29a31869ed0fd5ffc4b95050db966fcaf6d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Conflicts:
arch/arm/dts/armada-385-amc.dts
arch/arm/dts/armada-xp-theadorable.dts
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 083bf47c8b..c77abba1e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -310,7 +310,7 @@ F: arch/arm/cpu/armv7/stv0991/ F: arch/arm/include/asm/arch-stv0991/ ARM SUNXI -M: Jagan Teki <jagan@openedev.com> +M: Jagan Teki <jagan@amarulasolutions.com> M: Maxime Ripard <maxime.ripard@bootlin.com> S: Maintained T: git git://git.denx.de/u-boot-sunxi.git @@ -691,14 +691,14 @@ T: git git://git.denx.de/u-boot-sh.git F: arch/sh/ SPI -M: Jagan Teki <jagan@openedev.com> +M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained T: git git://git.denx.de/u-boot-spi.git F: drivers/spi/ F: include/spi* SPI-NOR -M: Jagan Teki <jagan@openedev.com> +M: Jagan Teki <jagan@amarulasolutions.com> M: Vignesh R <vigneshr@ti.com> S: Maintained F: drivers/mtd/spi/ |