Merge branch 'master' of git://git.denx.de/u-boot-arm

2010-05-04 22:49:15 +02:00
parent 4185ae7a71 20d98c2cea
commit 900a1fe8c8
51 changed files with 2815 additions and 736 deletions
--- a/2
+++ b/2
@@ -569,8 +569,10 @@ LIST_ARM9="			\
 	edb9312			\
 	edb9315			\
 	edb9315a		\
+	guruplug		\
 	imx27lite		\
 	lpd7a400		\
+	magnesium		\
 	mv88f6281gtw_ge		\
 	mx1ads			\
 	mx1fs2			\