Merge branch 'master' of git://git.denx.de/u-boot-ti
authorWolfgang Denk <wd@denx.de>
Fri, 12 Nov 2010 23:19:55 +0000 (00:19 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Nov 2010 23:19:55 +0000 (00:19 +0100)

Trivial merge