Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Thu, 6 Apr 2017 16:28:03 +0000 (12:28 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 7 Apr 2017 00:40:24 +0000 (20:40 -0400)
commitd53ecad92f06d2e38a5cbc13af7473867c7fa277
treecd46314f18a4e1b538a7973f1b74935f4ca2b096
parent891f7ae63318293cd5807fb611f86f545080b1f6
parente7bd15ea156f2a65d6aba167b9b7cd711caae2e6
Merge branch 'master' of git://git.denx.de/u-boot-sunxi

trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/cpu/arm920t/interrupts.c
arch/arm/cpu/arm920t/s3c24x0/interrupts.c
arch/arm/dts/Makefile
configs/orangepi_2_defconfig
scripts/config_whitelist.txt