From: Jon Loeliger <jdl@freescale.com>
Date: Mon, 13 Aug 2007 16:01:52 +0000 (-0500)
Subject: Merge commit 'remotes/wd/master'
X-Git-Tag: v1.3.0-rc1~19^2~27^2^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8e2dd87eee01bb1b83beab7caf22b851c5cafb2c;p=u-boot

Merge commit 'remotes/wd/master'

Conflicts:

	MAKEALL

With any luck, this is the last MAKEALL merge conflict!
---

8e2dd87eee01bb1b83beab7caf22b851c5cafb2c
diff --cc MAKEALL
index 22b12061eb,129c14c9f9..7fb10b3648
--- a/MAKEALL
+++ b/MAKEALL
@@@ -163,9 -333,8 +333,9 @@@ LIST_85xx="		
  ## MPC86xx Systems
  #########################################################################
  
- LIST_86xx="	\
-     MPC8641HPCN	\
+ LIST_86xx="		\
+ 	MPC8641HPCN	\
 +	SBC8641D	\
  "
  
  #########################################################################