Merge git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Thu, 24 Dec 2015 14:31:35 +0000 (09:31 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 24 Dec 2015 14:31:35 +0000 (09:31 -0500)
commit40253dd12a64086885097d253b665c9876635e76
treeab93904ec84b33c1e9336baa8eae710dd957683f
parent8182b41994f0b1824c31652d64171ffa596517fc
parente662573822d24dcdc079d29ff397cb8bacf97b27
Merge git://git.denx.de/u-boot-socfpga

Conflicts:
include/configs/axs101.h

Signed-off-by: Tom Rini <trini@konsulko.com>
include/configs/axs101.h
include/configs/sunxi-common.h