diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-21 14:25:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-21 14:25:37 -0400 |
| commit | 751b18b8a1b576aecf51faf22c2bb9e7ce70debd (patch) | |
| tree | 9339296afd74657deb93955cf5b187f9194d7b5d /MAINTAINERS | |
| parent | 3bacb5ee76eadc97c0606e1b408604d20db9a97d (diff) | |
| parent | ba2a0cbb053951ed6d36161989d38da724696b4d (diff) | |
| download | u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.tar.gz u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.tar.xz u-boot-751b18b8a1b576aecf51faf22c2bb9e7ce70debd.zip | |
Merge branch 'master' into next
Merge in v2020.10-rc5
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1ba71093f7..c96b8b6baa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -625,7 +625,7 @@ F: drivers/mtd/jedec_flash.c CLOCK M: Lukasz Majewski <lukma@denx.de> S: Maintained -T: git git://git.denx.de/u-boot-dfu.git +T: git https://gitlab.denx.de/u-boot/custodians/u-boot-clk.git F: drivers/clk/ F: drivers/clk/imx/ @@ -989,6 +989,8 @@ F: include/spmi/ SQUASHFS M: Joao Marcos Costa <joaomarcos.costa@bootlin.com> +R: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +R: Miquel Raynal <miquel.raynal@bootlin.com> S: Maintained F: fs/squashfs/ F: include/sqfs.h |