tree 2aa6702ee7c153d909a820ae9fda14d35877e59e
parent 90edf27fb89241917e91155bfdcc7c8e5a587222
parent c79bd89282136a4516e842fa542d6abf902ddeac
author Ingo Molnar <mingo@elte.hu> 1285221729 +0200
committer Ingo Molnar <mingo@elte.hu> 1285221729 +0200

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>