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)
commitd0303d71c2fb9bcb90a8d48e6462c78c86f70ce6
tree2aa6702ee7c153d909a820ae9fda14d35877e59e
parent90edf27fb89241917e91155bfdcc7c8e5a587222
parentc79bd89282136a4516e842fa542d6abf902ddeac
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