tree 74d162881710a7c6b4954d2a38dc4b24850c213a
parent d526de33d849b28d4416445fe16af678336d5cb1
parent e802594b6fa1b166308820c276b96dc0d7cc731c
author Wolfgang Denk <wd@pollux.denx.de> 1170174735 +0100
committer Wolfgang Denk <wd@denx.de> 1170174735 +0100

Merge with /home/sr/git/u-boot/denx-merge-sr