tree 74d162881710a7c6b4954d2a38dc4b24850c213a
parent 572469a054aab9ca04caa1c626e8475cbf5feb1d
parent 15adf4498b961ea4752ebaacb5e93331e8d3fefd
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