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

Merge branch 'master' into next 


Conflicts:
	board/esd/plu405/plu405.c
	drivers/rtc/ftrtc010.c

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents cd514aeb f68ab43d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 91 additions and 111 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