Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Wed, 2 Jul 2014 20:38:02 +0000 (16:38 -0400)
committerTom Rini <trini@ti.com>
Wed, 2 Jul 2014 20:38:02 +0000 (16:38 -0400)
commitfe8b3212b7938861eacdefe6115810303a96f9cc
tree281508c9caa5a969597a4dff58d3027337b8759c
parenta176ff0705351bf6d993a8f15e081bfa2ba2e1af
parent304f936aeaab0c3cc9d5af438fd3498ac7682991
Merge branch 'master' of git://git.denx.de/u-boot-arm