Merge branch 'master' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 25 Jan 2016 15:40:38 +0000 (10:40 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 25 Jan 2016 15:40:38 +0000 (10:40 -0500)
commit2218c54bc13c8045903afc05d1364439a230da1f
tree04c07b31c7953846b907fab4a4609a38e312b4ab
parentcc4228f9d69f58495c2404adba9145bb36e613bf
parented3fb1fb22fb9e0e786c58c2d80cd030b89b9b7d
Merge branch 'master' of git://git.denx.de/u-boot-imx