Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@ti.com>
Tue, 30 Dec 2014 21:42:23 +0000 (16:42 -0500)
committerTom Rini <trini@ti.com>
Tue, 30 Dec 2014 21:42:23 +0000 (16:42 -0500)
commit6d76e2aca82a0da47df80304211203f80b09f082
treea70a7a02f5e702b9bd633292d685a22a62fdb4b9
parent5523cc2b8aa01c81c1df476e4e466d418510eae3
parentd0e932de7c8e46ade1994e03e864636db3922520
Merge branch 'master' of git://git.denx.de/u-boot-socfpga