projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 656ae05 9ba9e85)
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)
Fixup include/configs/unipher.h to not set CONFIG_LIB_RAND

Signed-off-by: Tom Rini <trini@konsulko.com>
1  2 
board/sunxi/Kconfig patch | diff1 | diff2 | blob | history
include/configs/bur_am335x_common.h patch | diff1 | diff2 | blob | history
include/configs/sunxi-common.h patch | diff1 | diff2 | blob | history
include/configs/uniphier.h patch | diff1 | diff2 | blob | history

diff --cc board/sunxi/Kconfig
Simple merge
diff --cc include/configs/bur_am335x_common.h
Simple merge
diff --cc include/configs/sunxi-common.h
Simple merge
diff --cc include/configs/uniphier.h
Simple merge
Broadcom-s U-Boot