]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30bddf2 ccbc703)
Merge branch 'master' into hpc2
authorroy zang <tie-fei.zang@freescale.com>
Wed, 28 Feb 2007 08:46:48 +0000 (16:46 +0800)
committerZang Tiefei <roy@bus.ap.freescale.net>
Wed, 28 Feb 2007 08:46:48 +0000 (16:46 +0800)
commit00b574bdc8c54dbc9e03f63c24f62955d483e3ef
treedc49c4219bafd43c2ace6c5a3e6745d7b7264194tree | snapshot
parent30bddf2c46ab2e824f217a38db033118ac4622afcommit | diff
parentccbc7036648e465697ca298ba51e0e76dda352a0commit | 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
Cloned from git://git.denx.de/u-boot.git