diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-28 17:51:13 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-28 17:51:13 +0200 |
| commit | e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c (patch) | |
| tree | fb7b4ca068bf10217d28af5c33e7a0a9c9961c6a /MAINTAINERS | |
| parent | 9dc8fef2583f23ca6a99c6f5e709a8b80018364f (diff) | |
| parent | d6c6d127c5b948ec381fad5b24a2bc5497720644 (diff) | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9abff0a9826..3e70b037bf9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -665,9 +665,9 @@ Fabio Estevam <fabio.estevam@freescale.com> mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53 - mx6qsabresd i.MX6Q + mx6sabresd i.MX6Q/DL mx6qsabreauto i.MX6Q - wandboard i.MX6DL/S + wandboard i.MX6DL/S/Q mx6slevk i.MX6SL Daniel Gorsulowski <daniel.gorsulowski@esd.eu> |