Solve the copyright conflicts when merging 'master' into hpc2.
Merge branch 'master' into hpc2 Conflicts: drivers/cfi_flash.c
Showing
board/prodrive/alpr/Makefile
0 → 100644
board/prodrive/alpr/alpr.c
0 → 100644
board/prodrive/alpr/config.mk
0 → 100644
board/prodrive/alpr/fpga.c
0 → 100644
board/prodrive/alpr/init.S
0 → 100644
board/prodrive/alpr/nand.c
0 → 100644
board/prodrive/alpr/u-boot.lds
0 → 100644
common/cyclon2.c
0 → 100644
include/configs/alpr.h
0 → 100644
想要评论请 注册 或 登录