Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Tue, 17 Mar 2009 23:40:57 +0000 (00:40 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 17 Mar 2009 23:40:57 +0000 (00:40 +0100)

Trivial merge