Skip to content
Commit feaa43f3 authored by Stefan Roese's avatar Stefan Roese
Browse files

Merge branch 'for-1.3.2-ver2' 



Conflicts:

	cpu/ppc4xx/fdt.c
	include/configs/kilauea.h
	include/configs/sequoia.h

Signed-off-by: default avatarStefan Roese <sr@denx.de>
parents 8697e6a1 e174ac34
Expand all 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