diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-08-13 11:01:52 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-08-13 11:01:52 -0500 |
| commit | 8e2dd87eee01bb1b83beab7caf22b851c5cafb2c (patch) | |
| tree | 47a43e05d90de7d64ed356bab5f15e8d89f5b5cc /MAINTAINERS | |
| parent | cca34967cbd13ff6bd352be29e3f1cc88ab24c05 (diff) | |
| parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
| download | blackbird-obmc-uboot-8e2dd87eee01bb1b83beab7caf22b851c5cafb2c.tar.gz blackbird-obmc-uboot-8e2dd87eee01bb1b83beab7caf22b851c5cafb2c.zip | |
Merge commit 'remotes/wd/master'
Conflicts:
MAKEALL
With any luck, this is the last MAKEALL merge conflict!
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 703f2fe48e..5b17739b58 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -448,6 +448,12 @@ Nishant Kamat <nskamat@ti.com> omap1610h2 ARM926EJS +Sergey Kubushyn <ksi@koi8.net> + + DV-EVM ARM926EJS + SONATA ARM926EJS + SCHMOOGIE ARM926EJS + Prakash Kumar <prakash@embedx.com> cerf250 xscale |
