diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-08-24 22:32:24 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-08-24 22:32:24 +0200 |
commit | 83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb (patch) | |
tree | e59186b4d315c80255851e0d204143ecc21399a0 /kernel/bpf/Makefile | |
parent | e21ded5ecc531a64d6fc0c1693285e890b4e9569 (diff) | |
parent | 451fd72219dd6f3355e2d036c598544c760ee532 (diff) | |
download | linux-83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb.tar.bz2 |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
arch/x86/kernel/cpu/perf_event_intel_uncore*.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/Makefile')
-rw-r--r-- | kernel/bpf/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile new file mode 100644 index 000000000000..6a71145e2769 --- /dev/null +++ b/kernel/bpf/Makefile @@ -0,0 +1 @@ +obj-y := core.o |