diff options
| author | Tom Rini <trini@ti.com> | 2012-10-19 18:23:38 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-19 18:23:38 -0700 |
| commit | 99070db0dc0b0e881841a0091f06d53351244a34 (patch) | |
| tree | f54a53d89cf1125c8fe433bc51539144de43074c /MAINTAINERS | |
| parent | 7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e (diff) | |
| parent | 39826f09978a0a7070999acc15babf88f03e4051 (diff) | |
| download | u-boot-99070db0dc0b0e881841a0091f06d53351244a34.tar.gz u-boot-99070db0dc0b0e881841a0091f06d53351244a34.tar.bz2 u-boot-99070db0dc0b0e881841a0091f06d53351244a34.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/serial/serial_lh7a40x.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ff8e47caac..1b2da9421a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -583,6 +583,10 @@ Stefano Babic <sbabic@denx.de> twister omap3 vision2 i.MX51 +Lukasz Dalek <luk0104@gmail.com> + + h2200 xscale/pxa + Jason Liu <r64343@freescale.com> mx53evk i.MX53 |