mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08:00
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>