Merge branch 'master' of git://git.denx.de/u-boot-ti
authorWolfgang Denk <wd@denx.de>
Fri, 16 Jul 2010 21:24:38 +0000 (23:24 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 16 Jul 2010 21:24:38 +0000 (23:24 +0200)

Trivial merge