From: Wolfgang Denk <wd@denx.de>
Date: Sat, 5 Dec 2009 01:11:59 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2013.04~4308^2~6
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70;p=bsp%2Fu-boot.git

Merge branch 'master' into next

Conflicts:
	board/esd/plu405/plu405.c
	drivers/rtc/ftrtc010.c

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

2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70