diff options
Diffstat (limited to 'boards.cfg')
| -rw-r--r-- | boards.cfg | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg index 4eb5eb4e28..375f2d4718 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> |