]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core to fix conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 4 Nov 2013 06:49:35 +0000 (07:49 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 4 Nov 2013 06:49:35 +0000 (07:49 +0100)
commit342baca88b8d95353b96c2ad14e47bece8fccdea
tree79b2b4e060a97b1e7c60d58549f8c97cb15db5dd
parent3c98e7929d5f3e7aaea744a06b6e758703d8339e
parenta1ea2e98cde6d2401d1b79f5c543f982537997e1
Merge branch 'perf/urgent' into perf/core to fix conflicts

Conflicts:
tools/perf/bench/numa.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/uapi/linux/perf_event.h