Skip to content
Commit b08cadbd authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'objtool/urgent' 

Fixup conflicts.

# Conflicts:
#	tools/objtool/check.c
parents db2b0c5d fe255fe6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment