Skip to content
Snippets Groups Projects
Commit d86a0a6f authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Conflicts:

	board/amirix/ap1000/serial.c
	board/exbitgen/exbitgen.c
	board/exbitgen/flash.c
	board/ml2/serial.c
	board/xilinx/ml300/serial.c

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents a524e112 f492dd63
No related branches found
No related tags found
No related merge requests found
Showing
with 3404 additions and 28 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment