Merge commit 'remotes/wd/master'
authorJon Loeliger <jdl@freescale.com>
Mon, 13 Aug 2007 16:01:52 +0000 (11:01 -0500)
committerJon Loeliger <jdl@freescale.com>
Mon, 13 Aug 2007 16:01:52 +0000 (11:01 -0500)
Conflicts:

MAKEALL

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

1  2 
MAINTAINERS
MAKEALL
Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
index 22b12061eba93aa100fc9e6265c0a8f3dc931813,129c14c9f9a9c34b67ac40908ceca78feeab0a6a..7fb10b36486f9c36a57356bf11afd7acc96f35cc
+++ b/MAKEALL
@@@ -163,9 -333,8 +333,9 @@@ LIST_85xx="                
  ## MPC86xx Systems
  #########################################################################
  
- LIST_86xx="   \
-     MPC8641HPCN       \
+ LIST_86xx="           \
+       MPC8641HPCN     \
 +      SBC8641D        \
  "
  
  #########################################################################
diff --cc Makefile
Simple merge