Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

author Wolfgang Denk <wd@denx.de>

Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)

committer Wolfgang Denk <wd@denx.de>

Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)
author Wolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)
committer Wolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)
committer	Wolfgang Denk <wd@denx.de>
	Wed, 3 Feb 2010 19:05:27 +0000 (20:05 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history