Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

u-boot-2015.04
- Activity
- Members

Snippets Groups Projects

e95bcc36

Commit e95bcc36 authored 17 years ago by Wolfgang Denk

Downloads
- Plain Diff

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


Conflicts:

	drivers/rtc/Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>

parents 0b8f2a27 decbe029

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

README 1 addition, 0 deletions

README
drivers/rtc/Makefile 5 additions, 3 deletions

drivers/rtc/Makefile
drivers/rtc/isl1208.c 166 additions, 0 deletions

drivers/rtc/isl1208.c
fs/cramfs/uncompress.c 1 addition, 1 deletion

fs/cramfs/uncompress.c
include/configs/mgcoge.h 2 additions, 3 deletions

include/configs/mgcoge.h

with 175 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment