diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 09:01:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 09:01:12 +0100 |
| commit | 0967160ad615985c7c35443156ea9aecc60c37b8 (patch) | |
| tree | 658f728aff1be23540180091b718452a6848a6b0 /kernel/bpf | |
| parent | 2fde4f94e0a9531251e706fa57131b51b0df042e (diff) | |
| parent | b57c0b5175ddbe9b477801f9994a5b330702c1ba (diff) | |
| download | linux-stable-0967160ad615985c7c35443156ea9aecc60c37b8.tar.gz linux-stable-0967160ad615985c7c35443156ea9aecc60c37b8.tar.bz2 linux-stable-0967160ad615985c7c35443156ea9aecc60c37b8.zip | |
Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf')
0 files changed, 0 insertions, 0 deletions