Merge branch 'master' of git://www.denx.de/git/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:09:36 +0000 (23:09 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Jul 2008 21:09:36 +0000 (23:09 +0200)

Trivial merge