Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Fri, 30 Oct 2015 16:56:58 +0000 (12:56 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 30 Oct 2015 16:56:58 +0000 (12:56 -0400)
commit588eec2a8603ee8a8e2e913895767c4c02d523af
tree6c51f6e969c5ef309d424b87a0295800baefa87a
parentcde7f96109e4d367df51c8fc522acdcd10f2702e
parent7ee52af455c2cec7b674d2159806f7e95da8e6a5
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq