diff options
author | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
commit | c851a2458fbc12495f4f786d4eabb612850a5143 (patch) | |
tree | fa0b97f9ff8f744db11a1d296283ce7ce335a536 /board/altera/cyclone5-socdk/MAINTAINERS | |
parent | 14e7a30f2e8963fc5b91ba68e53bb2de708aee65 (diff) | |
parent | 29aa439759ed2e5dfa45cd8d6d5a1d51604e3820 (diff) | |
download | u-boot-imx-c851a2458fbc12495f4f786d4eabb612850a5143.zip u-boot-imx-c851a2458fbc12495f4f786d4eabb612850a5143.tar.gz u-boot-imx-c851a2458fbc12495f4f786d4eabb612850a5143.tar.bz2 |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
configs/socfpga_arria5_defconfig
configs/socfpga_cyclone5_defconfig
configs/socfpga_socrates_defconfig
Merged these by hand and re-ran savedefconfig on them.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/altera/cyclone5-socdk/MAINTAINERS')
-rw-r--r-- | board/altera/cyclone5-socdk/MAINTAINERS | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/board/altera/cyclone5-socdk/MAINTAINERS b/board/altera/cyclone5-socdk/MAINTAINERS new file mode 100644 index 0000000..f218ca4 --- /dev/null +++ b/board/altera/cyclone5-socdk/MAINTAINERS @@ -0,0 +1,12 @@ +SOCFPGA BOARD +M: Dinh Nguyen <dinguyen@altera.com> +M: Chin-Liang See <clsee@altera.com> +S: Maintained +F: board/altera/cyclone5-socdk/ +F: include/configs/socfpga_cyclone5.h +F: configs/socfpga_cyclone5_defconfig + +SOCRATES BOARD +M: Stefan Roese <sr@denx.de> +S: Maintained +F: configs/socfpga_socrates_defconfig |