]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2caea1e 6367684)
Merge branch 'master' of git://www.denx.de/git/u-boot-net
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:22:54 +0000 (23:22 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:22:54 +0000 (23:22 +0200)
1  2 
cpu/mpc83xx/cpu.c patch | diff1 | diff2 | blob | history
cpu/mpc85xx/cpu.c patch | diff1 | diff2 | blob | history

diff --cc cpu/mpc83xx/cpu.c
Simple merge
diff --cc cpu/mpc85xx/cpu.c
Simple merge
Cloned from git://git.denx.de/u-boot.git