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

diff --cc Makefile
Simple merge

diff --cc drivers/rtc/Makefile
index 6adece23cc0f89955a3f5eeadbf4e69f363887b4,3831dd9ee0cc3bc697c32abbb6339dd8ab47ec65..822dc1a0e17fc8f4e983ddc49f27e2362b84699f
--- 1/drivers/rtc/Makefile
--- 2/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -55,9 -55,9 +55,10 @@@ COBJS-$(CONFIG_RTC_MPC8xx) += mpc8xx.
  COBJS-$(CONFIG_RTC_PCF8563) += pcf8563.o
  COBJS-$(CONFIG_RTC_PL031) += pl031.o
  COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o
 +COBJS-$(CONFIG_RTC_RTC4543) += rtc4543.o
  COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
  COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o
+ COBJS-$(CONFIG_RTC_S3C44B0) += s3c44b0_rtc.o
  COBJS-$(CONFIG_RTC_X1205) += x1205.o
  
  COBJS := $(sort $(COBJS-y))