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

diff --cc MAINTAINERS
Simple merge

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/mtd/nand/Makefile
index c1325b905da63087064db9dbf673daecf635dc50,d4d39485329936600ebbe8419314a4bd64cc8948..a5680e80ee55256378ad5410ade4ddc83ca9a49a
--- 1/drivers/mtd/nand/Makefile
--- 2/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@@ -40,12 -40,12 +40,13 @@@ COBJS-$(CONFIG_DRIVER_NAND_BFIN) += bfi
  COBJS-$(CONFIG_NAND_DAVINCI) += davinci_nand.o
  COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
  COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
+ COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
  COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
  COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o
 -COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.c
 +COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o
  COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o
  COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
 +COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
  endif
  
  COBJS := $(COBJS-y)