tree 43a492b3f604adedc0ccc3a6432549681375b64f
parent eeaaa61e6b0d0e6a0af761074715b4aa5149a46b
parent 4e0e8d0df0c965df2eff2f872e6010b607bbf097
author Wolfgang Denk <wd@denx.de> 1211885761 +0200
committer Wolfgang Denk <wd@denx.de> 1211885761 +0200

Merge branch 'master' of /home/wd/git/u-boot/custodians

Conflicts:

	include/configs/socrates.h

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