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 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'sunxi-fixes-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes (diff) | |
| parent | ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* (diff) | |
| download | wireguard-linux-9fab907f3de67b6124b0337f11efe384c325d49d.tar.xz wireguard-linux-9fab907f3de67b6124b0337f11efe384c325d49d.zip | |
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 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions