Merge branch 'master' into hpc2
authorroy zang <tie-fei.zang@freescale.com>
Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
committerZang Tiefei <roy@bus.ap.freescale.net>
Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
1  2 
MAKEALL
Makefile
drivers/cfi_flash.c

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Simple merge