Skip to content
Commit 2e6e1772 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'next' of /home/wd/git/u-boot/next 



Conflicts:
	include/ppc4xx.h

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents 1e4e5ef0 3df61957
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment