Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Sat, 8 Nov 2008 23:01:42 +0000 (00:01 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 8 Nov 2008 23:01:42 +0000 (00:01 +0100)

Trivial merge