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

projects / oweals / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 30bddf2 ccbc703)

author	roy zang <tie-fei.zang@freescale.com>
	Wed, 28 Feb 2007 08:46:48 +0000 (16:46 +0800)
committer	Zang Tiefei <roy@bus.ap.freescale.net>
	Wed, 28 Feb 2007 08:46:48 +0000 (16:46 +0800)
commit	00b574bdc8c54dbc9e03f63c24f62955d483e3ef
tree	dc49c4219bafd43c2ace6c5a3e6745d7b7264194	tree \| snapshot
parent	30bddf2c46ab2e824f217a38db033118ac4622af	commit \| diff
parent	ccbc7036648e465697ca298ba51e0e76dda352a0	commit \| diff

Merge branch 'master' into hpc2

Conflicts:

drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>

MAKEALL	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history

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