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

Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master 



Conflicts:

	drivers/rtc/Makefile

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents 0b8f2a27 decbe029
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