Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

u-boot-2015.04
- Activity
- Members

Snippets Groups Projects

206c00f2

Commit 206c00f2 authored 15 years ago by Wolfgang Denk

Downloads
- Plain Diff

Merge branch 'master' into next


Conflicts:
	lib_generic/zlib.c

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

parents 39ff7d5f f8450829

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 1 addition, 0 deletions

Makefile
README 5 additions, 5 deletions

README
board/atmel/at91sam9261ek/at91sam9261ek.c 5 additions, 4 deletions

board/atmel/at91sam9261ek/at91sam9261ek.c
board/mucmc52/mucmc52.c 2 additions, 0 deletions

board/mucmc52/mucmc52.c
board/uc101/uc101.c 2 additions, 0 deletions

board/uc101/uc101.c
common/cmd_bootm.c 2 additions, 2 deletions

common/cmd_bootm.c
cpu/arm920t/s3c24x0/timer.c 2 additions, 0 deletions

cpu/arm920t/s3c24x0/timer.c
cpu/arm_cortexa8/omap3/board.c 1 addition, 1 deletion

cpu/arm_cortexa8/omap3/board.c
drivers/mtd/nand/nand_util.c 1 addition, 1 deletion

drivers/mtd/nand/nand_util.c
drivers/net/smc911x.c 2 additions, 2 deletions

drivers/net/smc911x.c
lib_generic/zlib.c 2 additions, 0 deletions

lib_generic/zlib.c
net/nfs.c 7 additions, 6 deletions

net/nfs.c

with 32 additions and 21 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