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)
commit0020db3f0da61f3e2c8a459a87598e07594dc8ac
tree2fe0852444f2412149130186bc740914f4ba794f
parent0d41ad7edcd23b6f23a1cf4e07b2d773493306fd
parent2883cc2d48e99fd1873ef8af03fee7966611b735
Merge remote branch 'origin/master' into next
MAKEALL
Makefile
drivers/mtd/cfi_flash.c