Merge branch 'master' of git://git.denx.de/u-boot-ti
authorWolfgang Denk <wd@denx.de>
Thu, 12 Aug 2010 21:08:05 +0000 (23:08 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 12 Aug 2010 21:08:05 +0000 (23:08 +0200)

Trivial merge