From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Sun, 5 Jul 2009 09:48:31 +0000 (+0400)
Subject: Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into... 
X-Git-Tag: Release-2010-05/1~2970^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f2b123cc44605c18a4cbfb530fc89e0c3ef2325;p=openembedded.git

Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

Conflicts:

	MAINTAINERS

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---

5f2b123cc44605c18a4cbfb530fc89e0c3ef2325
diff --cc MAINTAINERS
index 52d3087090,e6466618a5..2e33203f87
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -46,14 -46,12 +46,20 @@@ Interests:  Support in OE for single bo
  Machines:   cm-x270, em-x270, gesbc-9302
  Recipes:    mono, argtable, vala, socketcan
  
+ Person:     Denys Dmytriyenko
+ Mail:       denis@denix.org
+ Machines:   davinci (dm6446-evm, dm6467-evm, dm355-evm, dm365-evm), omap3evm
+ Distros:    Ångström, Arago
+ Interests:  External Toolchains
+ 
 +Person:     Dmitry Eremin-Solenikov
 +Mail:       dbaryshkov@gmail.com
 +Website:    http://tosa.lumag.spb.ru
 +Interests:  Kernel, Porting, evaluation hardware
 +Machines:   tosa, tqm8540, am91sam9g20ek
 +Distros:    Ångström
 +Recipes:    lowpan-tools, libnl
 +
  Person:     Erik Hovland
  Mail:       erik@hovland.org
  Distros:    familiar