Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Sun, 31 Aug 2008 22:03:40 +0000 (00:03 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 31 Aug 2008 22:03:40 +0000 (00:03 +0200)

Trivial merge