tree e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812
parent cd514aeb996e2f7aefbe1f78481965d9d074aed4
parent f68ab43de67f59925542efb6bcec30f4a84fe695
author Wolfgang Denk <wd@denx.de> 1259975519 +0100
committer Wolfgang Denk <wd@denx.de> 1259975519 +0100

Merge branch 'master' into next

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

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