]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 23 Sep 2010 06:02:09 +0000 (08:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 23 Sep 2010 06:02:09 +0000 (08:02 +0200)
commitc48b711019ecbb67e0a48db4743cb07c8c09c623
tree2aa6702ee7c153d909a820ae9fda14d35877e59e
parent2fb276a67f3bdbe3f8f263fc6d069ce9bde72119
parentd12182655fb7ffa56b27611bcae9b9c7f64656c6
Merge branch 'linus' into perf/core

Conflicts:
arch/sparc/kernel/perf_event.c

Merge reason: Resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/sparc/kernel/perf_event.c