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

Merge 'next' branch 


Conflicts:

	board/freescale/mpc8536ds/mpc8536ds.c
	include/configs/mgcoge.h

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents b59b16ca 360fe71e
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 529 additions and 325 deletions
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