Merge branch 'next' of git://git.denx.de/u-boot-ti into next
authorWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 19:58:16 +0000 (21:58 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Jun 2010 19:58:16 +0000 (21:58 +0200)

Trivial merge