diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-08 07:27:45 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-08 07:27:45 -0500 |
commit | ee1c499851e0fda1a6ab98fb1f1d1f672e64a6f8 (patch) | |
tree | 732cd565e5a59da41e14bfb69c2f85889eb6d478 /MAINTAINERS | |
parent | 3f2d4bf462825c106ef7a06a16ec8d5c07ef8949 (diff) | |
parent | fefff636337b53ac7fc1b0e9f38eb7b188bc0e60 (diff) |
Merge branch '2019-11-07-master-imports'
- Add Phytium Durian Board
- Assorted bugfixes
- Allow for make ERR_PTR/PTR_ERR architecture specific
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4a8b32cc28..ef2cbb3223 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -481,6 +481,13 @@ S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-zynqmp-r5/ +ARM PHYTIUM +M: liuhao <liuhao@phytium.com.cn> +M: shuyiqi <shuyiqi@phytium.com.cn> +S: Maintained +F: drivers/pci/pcie_phytium.c +F: arch/arm/dts/phytium-durian.dts + BINMAN M: Simon Glass <sjg@chromium.org> S: Maintained |