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

author Wolfgang Denk <wd@denx.de>

Thu, 14 Aug 2008 09:26:22 +0000 (11:26 +0200)

committer Wolfgang Denk <wd@denx.de>

Thu, 14 Aug 2008 09:26:22 +0000 (11:26 +0200)
author Wolfgang Denk <wd@denx.de>
Thu, 14 Aug 2008 09:26:22 +0000 (11:26 +0200)
committer Wolfgang Denk <wd@denx.de>
Thu, 14 Aug 2008 09:26:22 +0000 (11:26 +0200)
diff --cc cpu/arm920t/s3c24x0/nand.c
Simple merge
diff --cc drivers/mtd/onenand/onenand_base.c
Simple merge
diff --cc drivers/mtd/onenand/onenand_bbt.c
Simple merge
diff --cc include/linux/mtd/nand_legacy.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Thu, 14 Aug 2008 09:26:22 +0000 (11:26 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 14 Aug 2008 09:26:22 +0000 (11:26 +0200)
		1	2
cpu/arm920t/s3c24x0/nand.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/onenand_base.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/onenand_bbt.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mtd/nand_legacy.h	patch \|	diff1 \|	diff2 \|	blob \| history