diff options
author | Olof Johansson <olof@lixom.net> | 2017-01-16 21:46:42 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-01-16 21:46:42 -0800 |
commit | 9fab907f3de67b6124b0337f11efe384c325d49d (patch) | |
tree | d59106b242f2b16b0eb7e5c3591300e78cd7a83b /MAINTAINERS | |
parent | 927867a4b78b86d9eac48fe805e9af50cfd55da0 (diff) | |
parent | 3ef01c968fbfb21c2f16281445d30a865ee4412c (diff) | |
download | op-kernel-dev-9fab907f3de67b6124b0337f11efe384c325d49d.zip op-kernel-dev-9fab907f3de67b6124b0337f11efe384c325d49d.tar.gz |
Merge tag 'samsung-fixes-4.10' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c7397bd..9effa39 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1689,6 +1689,7 @@ M: Krzysztof Kozlowski <krzk@kernel.org> R: Javier Martinez Canillas <javier@osg.samsung.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) +Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/ S: Maintained F: arch/arm/boot/dts/s3c* F: arch/arm/boot/dts/s5p* |