diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-17 08:46:42 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-17 08:46:42 +0300 |
| commit | 9fab907f3de67b6124b0337f11efe384c325d49d (patch) | |
| tree | d59106b242f2b16b0eb7e5c3591300e78cd7a83b /arch/um/Kconfig.net | |
| parent | 927867a4b78b86d9eac48fe805e9af50cfd55da0 (diff) | |
| parent | 3ef01c968fbfb21c2f16281445d30a865ee4412c (diff) | |
| download | linux-9fab907f3de67b6124b0337f11efe384c325d49d.tar.xz | |
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 'arch/um/Kconfig.net')
0 files changed, 0 insertions, 0 deletions