diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-06-18 18:55:29 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-06-18 18:55:29 +0300 |
| commit | d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a (patch) | |
| tree | f7980a9c140174713b703851d06ed61283631e13 /.gitattributes | |
| parent | 14bda4e5293ed9722f1dc39b543024e37707d6c6 (diff) | |
| parent | 0f1441b44e823a74f3f3780902a113e07c73fbf6 (diff) | |
| download | linux-d832c0051f4e9cc7d26ef3bc6e9b662bc6a90f3a.tar.xz | |
Merge branch 'objtool/urgent' into objtool/core
Conflicts:
tools/objtool/elf.c
tools/objtool/elf.h
tools/objtool/orc_gen.c
tools/objtool/check.c
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions