]> 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)
commit4c2fb3953d4a17ac3491406f619ab450b0f2cb75
tree58fbef582846fef0e777b1a552aca12e21a071b1
parent2062c8fd74122f3df5808335fe3e98ab8343bd31
parentab6d7f7042c9b0896c0b17885741581de751a484
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