Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Tue, 6 Jan 2015 15:48:32 +0000 (10:48 -0500)
committerTom Rini <trini@ti.com>
Tue, 6 Jan 2015 15:48:32 +0000 (10:48 -0500)
commit7375f4007f7f0be439e9956ae429cdd4dd80b537
treedc230c35a77782a5fb9bcda426eccb2102652f52
parent2ed3f9114300b1f11f1f30d9d2478146afc3af0e
parent5ba471944abc63e837a29c905ac46ae362d5f6a5
Merge branch 'master' of git://git.denx.de/u-boot-sunxi