---
boards.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/boards.cfg b/boards.cfg
index 5e10125..9fecbed 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -43,7 +43,6 @@
# Status, Arch, CPU:SPLCPU, SoC, Vendor, Board name, Target, Options,
Maintainers
###########################################################################################################
-<<<<<<< HEAD
Active arm arm1136 - armltd integrator
integratorcp_cm1136 integratorcp:CM1136
Linus Walleij <[email protected]>
Active arm arm1136 mx31 - -
imx31_phycore -
-
Active arm arm1136 mx31 davedenx -
qong -
Wolfgang Denk <[email protected]>
--
1.8.4.2
_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot
