Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Mon, 1 Jun 2015 20:47:23 +0000 (16:47 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 2 Jun 2015 12:53:41 +0000 (08:53 -0400)
commit563e53efaadd76def21612bcf9f0236d870b6e68
tree0d66d466f2c9a4cd1f6356fe889a60429745ec13
parent656ae05273419c344c11466de72476455793d6b6
parent9ba9e85f3f1cc2e7d8b387a03c50eb067d915e0a
Merge branch 'master' of git://git.denx.de/u-boot-net

Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND

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