Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Tue, 27 May 2008 10:56:01 +0000 (12:56 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 27 May 2008 10:56:01 +0000 (12:56 +0200)
commit1f1554841a4c8e069d331176f0c3059fb2bb8280
tree43a492b3f604adedc0ccc3a6432549681375b64f
parent791e1dba8de76ad8e762a7badb869f224a1f8b82
parentc918261c6d9f265f88baf70f8a73dfe6f0cb9596
Merge branch 'master' of /home/wd/git/u-boot/custodians

Conflicts:

include/configs/socrates.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
include/configs/socrates.h