summaryrefslogtreecommitdiff
path: root/boards.cfg
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-10-31 03:59:46 +0100
committerTom Rini <trini@ti.com>2013-11-08 09:38:24 -0500
commit3314204b665e42aac360a0f709561d2686ea2862 (patch)
treed8eed8f19bfaa7bda678cb93dbb3b8634b05f631 /boards.cfg
parent7ec0cde292f90a77eee4328730fcd42b7c26788c (diff)
downloadu-boot-imx-3314204b665e42aac360a0f709561d2686ea2862.zip
u-boot-imx-3314204b665e42aac360a0f709561d2686ea2862.tar.gz
u-boot-imx-3314204b665e42aac360a0f709561d2686ea2862.tar.bz2
boards.cfg: remove git leftovers
Remove 'HEAD' line which is most likely left there while rebasing. It was introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0. Signed-off-by: Luka Perkov <luka@openwrt.org>
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg1
1 files changed, 0 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg
index 4eb5eb4..375f2d4 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 <linus.walleij@linaro.org>
Active arm arm1136 mx31 - - imx31_phycore - -
Active arm arm1136 mx31 davedenx - qong - Wolfgang Denk <wd@denx.de>