]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 27f33e9)
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
authorBartlomiej Sieka <tur@semihalf.com>
Wed, 26 Mar 2008 08:38:06 +0000 (09:38 +0100)
committerBartlomiej Sieka <tur@semihalf.com>
Wed, 26 Mar 2008 08:38:06 +0000 (09:38 +0100)
Conflicts:

common/cmd_bootm.c
cpu/mpc8xx/cpu.c

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

No differences found
Cloned from git://git.denx.de/u-boot.git