]> git.dujemihanovic.xyz Git - 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 <tie-fei.zang@freescale.com>
Mon, 22 Jan 2007 05:15:35 +0000 (13:15 +0800)
committerZang Tiefei <roy@bus.ap.freescale.net>
Mon, 22 Jan 2007 05:15:35 +0000 (13:15 +0800)
Conflicts:

drivers/cfi_flash.c

The patch by Heiko Schocher <hs@pollux.denx.de> 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
My U-Boot fork