]> Git Repo - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a41969e a401239)
Merge branch 'master' into hpc2
authorroy zang <[email protected]>
Mon, 22 Jan 2007 05:15:35 +0000 (13:15 +0800)
committerZang Tiefei <[email protected]>
Mon, 22 Jan 2007 05:15:35 +0000 (13:15 +0800)
Conflicts:

drivers/cfi_flash.c

The patch by Heiko Schocher <[email protected]> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.

1  2 
MAKEALL patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Empty description
This page took 0.045538 seconds and 4 git commands to generate.