From: Olof Johansson Date: Tue, 17 Jan 2017 05:46:42 +0000 (-0800) Subject: Merge tag 'samsung-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk... X-Git-Tag: v4.10-rc5~19^2~6 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9fab907f3de67b6124b0337f11efe384c325d49d;p=linux-block.git Merge tag 'samsung-fixes-4.10' of git://git./linux/kernel/git/krzk/linux into fixes Samsung fixes for v4.10: 1. Update maintainers entry with Patchwork address. 2. Fix invalid values for NF_CT_PROTO_* in s3c2410 defconfig (these options cannot be modules anymore). * tag 'samsung-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* MAINTAINERS: Add Patchwork URL to Samsung Exynos entry Signed-off-by: Olof Johansson --- 9fab907f3de67b6124b0337f11efe384c325d49d