Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sun, 22 Nov 2015 13:20:03 +0000 (08:20 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 22 Nov 2015 13:20:03 +0000 (08:20 -0500)
1  2 
include/configs/sunxi-common.h

Simple merge