Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
authorWolfgang Denk <wd@denx.de>
Sat, 17 Nov 2007 01:28:26 +0000 (02:28 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 17 Nov 2007 01:28:26 +0000 (02:28 +0100)

Trivial merge