Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Sat, 7 Feb 2009 22:24:38 +0000 (23:24 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 7 Feb 2009 22:24:38 +0000 (23:24 +0100)

Trivial merge