Merge remote branch 'origin/master' into next
authorWolfgang Denk <wd@denx.de>
Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 29 Mar 2010 10:33:43 +0000 (12:33 +0200)
1  2 
MAKEALL
Makefile
drivers/mtd/cfi_flash.c

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Simple merge