Merge with /home/raj/git/u-boot#ads5121_fixes
authorWolfgang Denk <wd@denx.de>
Sat, 8 Sep 2007 18:45:59 +0000 (20:45 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 8 Sep 2007 18:45:59 +0000 (20:45 +0200)

Trivial merge