]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Sat, 4 Jun 2011 10:28:05 +0000 (12:28 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 4 Jun 2011 10:28:05 +0000 (12:28 +0200)
commit4b373a750fafc08510d8e086d3b0d1f30c882975
tree58fbef582846fef0e777b1a552aca12e21a071b1
parent6f91d90335e17367f96a58c17f42c166cf80910d
parent330066834922fddd7e4b9e75de6f019a6a94934a
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/util/python.c

Merge reason: resolve the conflict with perf/urgent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/events/core.c