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

author Wolfgang Denk <wd@denx.de>

Sat, 13 Oct 2007 19:40:23 +0000 (21:40 +0200)

committer Wolfgang Denk <wd@denx.de>

Sat, 13 Oct 2007 19:40:23 +0000 (21:40 +0200)
author Wolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 19:40:23 +0000 (21:40 +0200)
committer Wolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 19:40:23 +0000 (21:40 +0200)
diff --cc Makefile
Simple merge
diff --cc include/config_cmd_all.h
Simple merge
diff --cc lib_arm/board.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sat, 13 Oct 2007 19:40:23 +0000 (21:40 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 13 Oct 2007 19:40:23 +0000 (21:40 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/config_cmd_all.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib_arm/board.c	patch \|	diff1 \|	diff2 \|	blob \| history