git.librecmc.org Git - oweals/u-boot.git/commit

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0b8f2a2 decbe02)

author	Wolfgang Denk <wd@denx.de>
	Sun, 16 Mar 2008 00:50:18 +0000 (01:50 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Sun, 16 Mar 2008 00:50:18 +0000 (01:50 +0100)
commit	e95bcc3661a78ccc094c365ecd2484d00a60f97d
tree	0987662fbde9b8792a95ff00023bc22cfbaf2528	tree \| snapshot
parent	0b8f2a27861a9fd06eb55a34f855ec9c5102aab4	commit \| diff
parent	decbe029b2a9d3333d02c433389b1c821eea96d7	commit \| 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>

drivers/rtc/Makefile

Unnamed repository; edit this file 'description' to name the repository.