Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@ti.com>
Wed, 10 Sep 2014 00:01:59 +0000 (20:01 -0400)
committerTom Rini <trini@ti.com>
Wed, 10 Sep 2014 00:01:59 +0000 (20:01 -0400)
commit8c9c74e4c69b43cd50a1f04b34cfc141ed21654c
tree180763abe35a9465d2dc4d46202ac604e7b7baac
parent0b703dbcee7103f07804d0a4328d1593355c4324
parentb4ecc8c6f8c85d25f72933af23531728069a5b0f
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq