Merge remote branch 'origin/master' into next

author Wolfgang Denk <wd@denx.de>

Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)

committer Wolfgang Denk <wd@denx.de>

Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
author Wolfgang Denk <wd@denx.de>
Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
committer Wolfgang Denk <wd@denx.de>
Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/mtd/cfi_flash.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/cfi_flash.c	patch \|	diff1 \|	diff2 \|	blob \| history