Skip to content

Commit c06a382

Browse files
committed
Resolve conflicts
1 parent 2af19bc commit c06a382

2,411 files changed

Lines changed: 380 additions & 666289 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

sys/external/gpl2/dts/dist/arch/arm/boot/dts/Makefile

Lines changed: 40 additions & 1500 deletions
Large diffs are not rendered by default.

sys/external/gpl2/dts/dist/arch/arm/boot/dts/aks-cdu.dts

Lines changed: 0 additions & 122 deletions
This file was deleted.

sys/external/gpl2/dts/dist/arch/arm/boot/dts/alphascale-asm9260-devkit.dts

Lines changed: 0 additions & 13 deletions
This file was deleted.

sys/external/gpl2/dts/dist/arch/arm/boot/dts/alphascale-asm9260.dtsi

Lines changed: 0 additions & 64 deletions
This file was deleted.

sys/external/gpl2/dts/dist/arch/arm/boot/dts/alpine-db.dts

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)