]> 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)
commit48c79d42ccc7648121d23e4d213e0b7820e4da36
tree79b2b4e060a97b1e7c60d58549f8c97cb15db5dd
parentbce30d8054d76fade46965751a58d0bfce447e11
parent7e6d92692a35b82cd779751985047568ed30e995
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