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

Conflicts:
	drivers/spi/Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc MAINTAINERS
Simple merge

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/spi/Makefile
index 1272c17761a6656615ad502d77dbe4dc8a2eaf1a,7ffa47db5c3f6e77ec94793fbeaa38fd7105be54..a9f67a0ac0dbf164266dba3618bf32f68fd29d55
--- 1/drivers/spi/Makefile
--- 2/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -28,7 -28,7 +28,8 @@@ LIB   := $(obj)libspi.
  COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
  COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
  COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o
+ COBJS-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o
 +COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
  COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
  COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
  COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o