diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 18:24:13 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 18:24:13 +0200 |
| commit | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (patch) | |
| tree | 08c0259674f532de0d272740e4b7dcd778132fe0 /MAINTAINERS | |
| parent | 425faf74cd8189c87919f7e72a0101c684ee3b9f (diff) | |
| parent | 326ea986ac150acdc7656d57fca647db80b50158 (diff) | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4033b882cc..23965a8d33 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -602,7 +602,6 @@ Jason Liu <r64343@freescale.com> mx53evk i.MX53 mx53loco i.MX53 mx6qarm2 i.MX6Q - mx6qsabrelite i.MX6Q Enric Balletbo i Serra <eballetbo@iseebcn.com> @@ -1072,6 +1071,7 @@ Pali Rohár <pali.rohar@gmail.com> nokia_rx51 ARM ARMV7 (OMAP34xx SoC) Eric Nelson <eric.nelson@boundarydevices.com> + mx6qsabrelite i.MX6Q 1GB nitrogen6dl i.MX6DL 1GB nitrogen6dl2g i.MX6DL 2GB nitrogen6q i.MX6Q/6D 1GB |