Merge branch 'master' of git://git.denx.de/u-boot-coldfire
authorTom Rini <trini@ti.com>
Mon, 29 Oct 2012 15:02:11 +0000 (08:02 -0700)
committerTom Rini <trini@ti.com>
Mon, 29 Oct 2012 15:02:11 +0000 (08:02 -0700)

Trivial merge