Merge branch 'master' into hpc2

author roy zang <tie-fei.zang@freescale.com>

Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)

committer Zang Tiefei <roy@bus.ap.freescale.net>

Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
author roy zang <tie-fei.zang@freescale.com>
Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
committer Zang Tiefei <roy@bus.ap.freescale.net>
Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/cfi_flash.c
Simple merge
author	roy zang <tie-fei.zang@freescale.com>
	Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
committer	Zang Tiefei <roy@bus.ap.freescale.net>
	Thu, 4 Jan 2007 03:10:05 +0000 (11:10 +0800)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/cfi_flash.c	patch \|	diff1 \|	diff2 \|	blob \| history