yair/u-boot-tk1-som
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

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

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk
2009-12-05 02:11:59 +01:00
parent cd514aeb99 f68ab43de6
commit 2a49bf3149
66 changed files with 817 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/Makefile
View File

@@ -29,7 +29,6 @@ AOBJS =
# core
COBJS-y += main.o
COBJS-y += circbuf.o
COBJS-y += console.o
COBJS-y += command.o
COBJS-y += dlmalloc.o