From eae5b27ade3da259a1b969bcfb029337f0c0c836 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 3 Aug 2016 11:13:07 +0200 Subject: [PATCH] arm-soc: document merges Signed-off-by: Arnd Bergmann --- arch/arm/arm-soc-for-next-contents.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt index 7f971361d217..9e1ade6bdbac 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -4,6 +4,7 @@ fixes ARM: do away with final ARCH_REQUIRE_GPIOLIB MAINTAINER: alpine: add a mailing list ARM: shmobile: don't call platform_can_secondary_boot on UP + Revert "ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME" next/fixes-non-critical -- 2.34.1