arm-soc: document merges

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt
index 7f971361d217cf1d2a81f73380ff67ab8058b708..9e1ade6bdbac51e4bf644c2ee1701566e6240d4b 100644 (file)
--- 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