forked from luck/tmp_suning_uos_patched
b1aa3db2c1
Minor conflict in tools/perf/arch/arm/util/auxtrace.c as one fix there was cherry-picked for the last perf/urgent pull req to Linus, so was already there. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
||
---|---|---|
.. | ||
asm | ||
asm-generic | ||
linux | ||
nolibc | ||
tools | ||
trace/events | ||
uapi | ||
vdso |