tree 7955ea4d2bc15b8eb5e81af7a8d05cd51e25d516
parent cb1c989b70c2234b059a579f85744320721c4169
parent 26a128961cb59eae35f97e6936baf4c1dbd2231f
author Tom Rini <trini@ti.com> 1351522931 -0700
committer Tom Rini <trini@ti.com> 1351522931 -0700

Merge branch 'master' of git://git.denx.de/u-boot-coldfire