From: Tom Rini <trini@konsulko.com>
Date: Mon, 1 Jun 2015 20:47:23 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-net
X-Git-Tag: v2015.07-rc2~47
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=563e53efaadd76def21612bcf9f0236d870b6e68;p=u-boot

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>
---

563e53efaadd76def21612bcf9f0236d870b6e68