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)
1  2 
include/configs/sunxi-common.h

Simple merge