Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 2 Jan 2017 21:32:05 +0000 (16:32 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 2 Jan 2017 21:32:05 +0000 (16:32 -0500)
commit516457013e5a88f65f9d6c11e9171cb03871cc92
tree583cfafeddbacd1d1a456f49f1e687c4eb8e062c
parent99b02b4dce0b2fc759fb8ced5701c0d4fb7b2200
parent7c4f0ff81e6fc3b58b8af5f64c3da98624e40132
Merge branch 'master' of git://denx.de/git/u-boot-imx