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

Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx


Conflicts:

	lib_ppc/board.c

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents 23c5189e 70431e8a
No related branches found
No related tags found
No related merge requests found
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