Merge http://www.denx.de/git/u-boot

author Kim Phillips <kim.phillips@freescale.com>

Wed, 29 Nov 2006 05:35:49 +0000 (23:35 -0600)

committer Kim Phillips <kim.phillips@freescale.com>

Wed, 29 Nov 2006 05:35:49 +0000 (23:35 -0600)
author Kim Phillips <kim.phillips@freescale.com>
Wed, 29 Nov 2006 05:35:49 +0000 (23:35 -0600)
committer Kim Phillips <kim.phillips@freescale.com>
Wed, 29 Nov 2006 05:35:49 +0000 (23:35 -0600)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc drivers/nand/nand_base.c
Simple merge
diff --cc include/common.h
Simple merge
author	Kim Phillips <kim.phillips@freescale.com>
	Wed, 29 Nov 2006 05:35:49 +0000 (23:35 -0600)
committer	Kim Phillips <kim.phillips@freescale.com>
	Wed, 29 Nov 2006 05:35:49 +0000 (23:35 -0600)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nand/nand_base.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history