Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Mon, 20 Jan 2014 12:33:42 +0000 (07:33 -0500)
committerTom Rini <trini@ti.com>
Mon, 20 Jan 2014 12:33:42 +0000 (07:33 -0500)
commit4641c211f6e37454c30770521c4de79c725036b0
tree630407124b5e1649a93c995122c14510ef8a19b8
parent5c9038b6af1a93410af966999638eabb81efcd0f
parentbe2a3bb39adf1fdd274fc427e30ef62eb86441a1
Merge branch 'master' of git://denx.de/git/u-boot-imx