Merge branch 'next' of git://git.denx.de/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:24:44 +0000 (21:24 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:24:44 +0000 (21:24 +0100)

Trivial merge