Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@ti.com>
Mon, 16 Feb 2015 19:55:50 +0000 (14:55 -0500)
committerTom Rini <trini@ti.com>
Tue, 17 Feb 2015 11:27:44 +0000 (06:27 -0500)
commita851604ca36493e8319a7d3a17594b7224d546fe
treedff68fbdd1b098e334d0da031de250dc8852c3b9
parent0ce3f1f90ae6168805f20e473a9ed7fab5fb13a8
parent840fe95c3bcff7692c51b90ebc0d350792597ff0
Merge branch 'master' of git.denx.de/u-boot-sunxi
include/configs/sunxi-common.h