Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

Conflicts:

	drivers/rtc/Makefile

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

diff --cc drivers/rtc/Makefile
index 56847d244880ccf313941b684608bded694893b0,c1bf3197085e506f183767a7f69b6328876780eb..9be2130e1b80bd308cd6f278bd36ea0b3a631f52
--- 1/drivers/rtc/Makefile
--- 2/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -39,12 -39,13 +39,15 @@@ COBJS-y += ds1556.
  COBJS-y += ds164x.o
  COBJS-y += ds174x.o
  COBJS-y += ds3231.o
+ COBJS-$(CONFIG_RTC_ISL1208) += isl1208.o
  COBJS-y += m41t11.o
  COBJS-y += m41t60.o
 +COBJS-$(CONFIG_RTC_M41T62) += m41t62.o
 +COBJS-y += max6900.o
  COBJS-y += m48t35ax.o
+ COBJS-y += max6900.o
  COBJS-y += mc146818.o
+ COBJS-y += mcfrtc.o
  COBJS-y += mk48t59.o
  COBJS-y += mpc5xxx.o
  COBJS-y += mpc8xx.o