tree 43a492b3f604adedc0ccc3a6432549681375b64f
parent 791e1dba8de76ad8e762a7badb869f224a1f8b82
parent c918261c6d9f265f88baf70f8a73dfe6f0cb9596
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>